Skip to content

Commit 9c32aac

Browse files
zoecarverzoecarver
committed
[nfc] Remove dead operator code pt. 1
1 parent 9857464 commit 9c32aac

File tree

3 files changed

+5
-190
lines changed

3 files changed

+5
-190
lines changed

‎include/swift/SIL/AbstractionPattern.h

Lines changed: 1 addition & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -194,16 +194,6 @@ class AbstractionPattern {
194194
/// non-static member function. OrigType is valid and is a function type.
195195
/// CXXMethod is valid.
196196
PartialCurriedCXXMethodType,
197-
/// The uncurried imported type of a C++ operator non-static member
198-
/// function. OrigType is valid and is a function type. CXXMethod is valid.
199-
CXXOperatorMethodType,
200-
/// The curried imported type of a C++ operator non-static member function.
201-
/// OrigType is valid and is a function type. CXXMethod is valid.
202-
CurriedCXXOperatorMethodType,
203-
/// The partially-applied curried imported type of a C++ operator non-static
204-
/// member function. OrigType is valid and is a function type. CXXMethod is
205-
/// valid.
206-
PartialCurriedCXXOperatorMethodType,
207197
/// A Swift function whose parameters and results are opaque. This is
208198
/// like `AP::Type<T>((T) -> T)`, except that the number of parameters is
209199
/// unspecified.
@@ -470,9 +460,6 @@ class AbstractionPattern {
470460
case Kind::CXXMethodType:
471461
case Kind::CurriedCXXMethodType:
472462
case Kind::PartialCurriedCXXMethodType:
473-
case Kind::CXXOperatorMethodType:
474-
case Kind::CurriedCXXOperatorMethodType:
475-
case Kind::PartialCurriedCXXOperatorMethodType:
476463
return true;
477464

478465
default:
@@ -513,9 +500,6 @@ class AbstractionPattern {
513500
case Kind::CXXMethodType:
514501
case Kind::CurriedCXXMethodType:
515502
case Kind::PartialCurriedCXXMethodType:
516-
case Kind::CXXOperatorMethodType:
517-
case Kind::CurriedCXXOperatorMethodType:
518-
case Kind::PartialCurriedCXXOperatorMethodType:
519503
return true;
520504

521505
default:
@@ -614,9 +598,6 @@ class AbstractionPattern {
614598
case Kind::CXXMethodType:
615599
case Kind::CurriedCXXMethodType:
616600
case Kind::PartialCurriedCXXMethodType:
617-
case Kind::CXXOperatorMethodType:
618-
case Kind::CurriedCXXOperatorMethodType:
619-
case Kind::PartialCurriedCXXOperatorMethodType:
620601
case Kind::ObjCCompletionHandlerArgumentsType:
621602
return true;
622603
case Kind::Invalid:
@@ -712,10 +693,6 @@ class AbstractionPattern {
712693
static AbstractionPattern
713694
getCurriedCXXMethod(CanType origType, const AbstractFunctionDecl *function);
714695

715-
static AbstractionPattern
716-
getCurriedCXXOperatorMethod(CanType origType,
717-
const AbstractFunctionDecl *function);
718-
719696
/// Return an abstraction pattern for the uncurried type of a C++ method.
720697
///
721698
/// For example, if the original function is:
@@ -733,16 +710,6 @@ class AbstractionPattern {
733710
return pattern;
734711
}
735712

736-
static AbstractionPattern
737-
getCXXOperatorMethod(CanType origType, const clang::CXXMethodDecl *method,
738-
ImportAsMemberStatus memberStatus) {
739-
assert(isa<AnyFunctionType>(origType));
740-
AbstractionPattern pattern;
741-
pattern.initCXXMethod(nullptr, origType, method,
742-
Kind::CXXOperatorMethodType, memberStatus);
743-
return pattern;
744-
}
745-
746713
/// Return an abstraction pattern for the curried type of a C++ method.
747714
///
748715
/// For example, if the original function is:
@@ -760,17 +727,6 @@ class AbstractionPattern {
760727
return pattern;
761728
}
762729

763-
static AbstractionPattern
764-
getCurriedCXXOperatorMethod(CanType origType,
765-
const clang::CXXMethodDecl *method,
766-
ImportAsMemberStatus memberStatus) {
767-
assert(isa<AnyFunctionType>(origType));
768-
AbstractionPattern pattern;
769-
pattern.initCXXMethod(nullptr, origType, method,
770-
Kind::CurriedCXXOperatorMethodType, memberStatus);
771-
return pattern;
772-
}
773-
774730
/// For a C-function-as-method pattern,
775731
/// get the index of the C function parameter that was imported as the
776732
/// `self` parameter of the imported method, or None if this is a static
@@ -877,18 +833,6 @@ class AbstractionPattern {
877833
return pattern;
878834
}
879835

880-
static AbstractionPattern
881-
getPartialCurriedCXXOperatorMethod(CanGenericSignature signature,
882-
CanType origType,
883-
const clang::CXXMethodDecl *method,
884-
ImportAsMemberStatus memberStatus) {
885-
assert(isa<AnyFunctionType>(origType));
886-
AbstractionPattern pattern;
887-
pattern.initCXXMethod(signature, origType, method,
888-
Kind::PartialCurriedCXXOperatorMethodType, memberStatus);
889-
return pattern;
890-
}
891-
892836
public:
893837
/// Return an abstraction pattern for the type of an Objective-C method.
894838
static AbstractionPattern
@@ -1026,9 +970,6 @@ class AbstractionPattern {
1026970
case Kind::CXXMethodType:
1027971
case Kind::CurriedCXXMethodType:
1028972
case Kind::PartialCurriedCXXMethodType:
1029-
case Kind::CXXOperatorMethodType:
1030-
case Kind::CurriedCXXOperatorMethodType:
1031-
case Kind::PartialCurriedCXXOperatorMethodType:
1032973
case Kind::Type:
1033974
case Kind::Discard:
1034975
return OrigType;
@@ -1065,9 +1006,6 @@ class AbstractionPattern {
10651006
case Kind::CXXMethodType:
10661007
case Kind::CurriedCXXMethodType:
10671008
case Kind::PartialCurriedCXXMethodType:
1068-
case Kind::CXXOperatorMethodType:
1069-
case Kind::CurriedCXXOperatorMethodType:
1070-
case Kind::PartialCurriedCXXOperatorMethodType:
10711009
case Kind::Type:
10721010
case Kind::Discard:
10731011
case Kind::ObjCCompletionHandlerArgumentsType:
@@ -1106,9 +1044,6 @@ class AbstractionPattern {
11061044
case Kind::CXXMethodType:
11071045
case Kind::CurriedCXXMethodType:
11081046
case Kind::PartialCurriedCXXMethodType:
1109-
case Kind::CXXOperatorMethodType:
1110-
case Kind::CurriedCXXOperatorMethodType:
1111-
case Kind::PartialCurriedCXXOperatorMethodType:
11121047
case Kind::ObjCCompletionHandlerArgumentsType:
11131048
return true;
11141049
}
@@ -1147,9 +1082,7 @@ class AbstractionPattern {
11471082
/// If so, it is legal to call getCXXMethod().
11481083
bool isCXXMethod() const {
11491084
return (getKind() == Kind::CXXMethodType ||
1150-
getKind() == Kind::CurriedCXXMethodType ||
1151-
getKind() == Kind::CXXOperatorMethodType ||
1152-
getKind() == Kind::CurriedCXXOperatorMethodType);
1085+
getKind() == Kind::CurriedCXXMethodType);
11531086
}
11541087

11551088
const clang::CXXMethodDecl *getCXXMethod() const {
@@ -1184,9 +1117,6 @@ class AbstractionPattern {
11841117
case Kind::CXXMethodType:
11851118
case Kind::CurriedCXXMethodType:
11861119
case Kind::PartialCurriedCXXMethodType:
1187-
case Kind::CXXOperatorMethodType:
1188-
case Kind::CurriedCXXOperatorMethodType:
1189-
case Kind::PartialCurriedCXXOperatorMethodType:
11901120
case Kind::OpaqueFunction:
11911121
case Kind::OpaqueDerivativeFunction:
11921122
case Kind::ObjCCompletionHandlerArgumentsType:
@@ -1224,9 +1154,6 @@ class AbstractionPattern {
12241154
case Kind::CXXMethodType:
12251155
case Kind::CurriedCXXMethodType:
12261156
case Kind::PartialCurriedCXXMethodType:
1227-
case Kind::CXXOperatorMethodType:
1228-
case Kind::CurriedCXXOperatorMethodType:
1229-
case Kind::PartialCurriedCXXOperatorMethodType:
12301157
case Kind::Type:
12311158
case Kind::Discard:
12321159
case Kind::ObjCCompletionHandlerArgumentsType:
@@ -1256,9 +1183,6 @@ class AbstractionPattern {
12561183
case Kind::CXXMethodType:
12571184
case Kind::CurriedCXXMethodType:
12581185
case Kind::PartialCurriedCXXMethodType:
1259-
case Kind::CXXOperatorMethodType:
1260-
case Kind::CurriedCXXOperatorMethodType:
1261-
case Kind::PartialCurriedCXXOperatorMethodType:
12621186
case Kind::OpaqueFunction:
12631187
case Kind::OpaqueDerivativeFunction:
12641188
case Kind::ObjCCompletionHandlerArgumentsType:
@@ -1289,9 +1213,6 @@ class AbstractionPattern {
12891213
case Kind::CXXMethodType:
12901214
case Kind::CurriedCXXMethodType:
12911215
case Kind::PartialCurriedCXXMethodType:
1292-
case Kind::CXXOperatorMethodType:
1293-
case Kind::CurriedCXXOperatorMethodType:
1294-
case Kind::PartialCurriedCXXOperatorMethodType:
12951216
case Kind::OpaqueFunction:
12961217
case Kind::OpaqueDerivativeFunction:
12971218
return false;
@@ -1320,9 +1241,6 @@ class AbstractionPattern {
13201241
case Kind::CXXMethodType:
13211242
case Kind::CurriedCXXMethodType:
13221243
case Kind::PartialCurriedCXXMethodType:
1323-
case Kind::CXXOperatorMethodType:
1324-
case Kind::CurriedCXXOperatorMethodType:
1325-
case Kind::PartialCurriedCXXOperatorMethodType:
13261244
case Kind::OpaqueFunction:
13271245
case Kind::OpaqueDerivativeFunction:
13281246
llvm_unreachable("pattern is not a tuple");

0 commit comments

Comments
 (0)