remove some dead arguments to ObjCMethodDecl.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@48406 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/clang/AST/DeclObjC.h b/include/clang/AST/DeclObjC.h
index b377bb8..5e85f9c 100644
--- a/include/clang/AST/DeclObjC.h
+++ b/include/clang/AST/DeclObjC.h
@@ -77,7 +77,7 @@
/// ParamInfo - new[]'d array of pointers to VarDecls for the formal
/// parameters of this Method. This is null if there are no formals.
ParmVarDecl **ParamInfo;
- int NumMethodParams; // -1 if no parameters
+ int NumMethodParams;
/// List of attributes for this method declaration.
AttributeList *MethodAttrs;
@@ -92,7 +92,6 @@
ObjCMethodDecl(SourceLocation beginLoc, SourceLocation endLoc,
Selector SelInfo, QualType T,
Decl *contextDecl,
- ParmVarDecl **paramInfo = 0, int numParams=-1,
AttributeList *M = 0, bool isInstance = true,
bool isVariadic = false,
ImplementationControl impControl = None,
@@ -102,20 +101,17 @@
DeclImplementation(impControl), objcDeclQualifier(OBJC_TQ_None),
MethodContext(static_cast<NamedDecl*>(contextDecl)),
SelName(SelInfo), MethodDeclType(T),
- ParamInfo(paramInfo), NumMethodParams(numParams),
+ ParamInfo(0), NumMethodParams(0),
MethodAttrs(M), EndLoc(endLoc), Body(0), SelfDecl(0) {}
+ virtual ~ObjCMethodDecl();
public:
static ObjCMethodDecl *Create(ASTContext &C, SourceLocation beginLoc,
SourceLocation endLoc, Selector SelInfo,
QualType T, Decl *contextDecl,
- ParmVarDecl **paramInfo = 0, int numParams=-1,
AttributeList *M = 0, bool isInstance = true,
bool isVariadic = false,
- ImplementationControl impControl = None,
- Decl *PrevDecl = 0);
-
- virtual ~ObjCMethodDecl();
+ ImplementationControl impControl = None);
ObjCDeclQualifier getObjCDeclQualifier() const {
return ObjCDeclQualifier(objcDeclQualifier);
diff --git a/lib/AST/DeclObjC.cpp b/lib/AST/DeclObjC.cpp
index ccdc499..9580e0c 100644
--- a/lib/AST/DeclObjC.cpp
+++ b/lib/AST/DeclObjC.cpp
@@ -23,15 +23,13 @@
SourceLocation endLoc,
Selector SelInfo, QualType T,
Decl *contextDecl,
- ParmVarDecl **paramInfo, int numParams,
AttributeList *M, bool isInstance,
bool isVariadic,
- ImplementationControl impControl,
- Decl *PrevDecl) {
+ ImplementationControl impControl) {
void *Mem = C.getAllocator().Allocate<ObjCMethodDecl>();
return new (Mem) ObjCMethodDecl(beginLoc, endLoc, SelInfo, T, contextDecl,
- paramInfo, numParams, M, isInstance,
- isVariadic, impControl, PrevDecl);
+ M, isInstance,
+ isVariadic, impControl);
}
diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index 7fc2698..a677662 100644
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -840,7 +840,7 @@
ObjCMethodDecl* ObjCMethod =
ObjCMethodDecl::Create(Context, MethodLoc, EndLoc, Sel, resultDeclType,
- ClassDecl, 0, -1, AttrList,
+ ClassDecl, AttrList,
MethodType == tok::minus, isVariadic,
MethodDeclKind == tok::objc_optional ?
ObjCMethodDecl::Optional :