Remove ObjcMethodDecl::getNumMethodParams/getMethodParamDecl, they aren't used/needed.
Change ObjcMethodDecl::getMethodType to getResultType, to match FunctionDecl.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@43045 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Sema/SemaDecl.cpp b/Sema/SemaDecl.cpp
index 232c5ba..bb100c6 100644
--- a/Sema/SemaDecl.cpp
+++ b/Sema/SemaDecl.cpp
@@ -1760,8 +1760,8 @@
/// TODO: Handle protocol list; such as id<p1,p2> in type comparisons
bool Sema:: MatchTwoMethodDeclarations(const ObjcMethodDecl *Method,
const ObjcMethodDecl *PrevMethod) {
- if (Method->getMethodType().getCanonicalType() !=
- PrevMethod->getMethodType().getCanonicalType())
+ if (Method->getResultType().getCanonicalType() !=
+ PrevMethod->getResultType().getCanonicalType())
return false;
for (int i = 0; i < Method->getNumParams(); i++) {
ParmVarDecl *ParamDecl = Method->getParamDecl(i);
diff --git a/Sema/SemaExpr.cpp b/Sema/SemaExpr.cpp
index 082b718..896b318 100644
--- a/Sema/SemaExpr.cpp
+++ b/Sema/SemaExpr.cpp
@@ -1944,7 +1944,7 @@
SourceRange(lbrac, rbrac));
returnType = GetObjcIdType();
} else {
- returnType = Method->getMethodType();
+ returnType = Method->getResultType();
}
// Expr *RExpr = global reference to the class symbol...
Expr **ArgExprs = reinterpret_cast<Expr **>(Args);
@@ -1972,7 +1972,7 @@
SourceRange(lbrac, rbrac));
returnType = GetObjcIdType();
} else {
- returnType = Method->getMethodType();
+ returnType = Method->getResultType();
}
} else {
// FIXME (snaroff): checking in this code from Patrick. Needs to be
@@ -1995,7 +1995,7 @@
SourceRange(lbrac, rbrac));
returnType = GetObjcIdType();
} else {
- returnType = Method->getMethodType();
+ returnType = Method->getResultType();
}
}
Expr **ArgExprs = reinterpret_cast<Expr **>(Args);
diff --git a/include/clang/AST/DeclObjC.h b/include/clang/AST/DeclObjC.h
index 9df6a43..bbab58a 100644
--- a/include/clang/AST/DeclObjC.h
+++ b/include/clang/AST/DeclObjC.h
@@ -231,14 +231,10 @@
ParamInfo(paramInfo), NumMethodParams(numParams),
MethodAttrs(M) {}
virtual ~ObjcMethodDecl();
- Selector getSelector() const { return SelName; }
- QualType getMethodType() const { return MethodDeclType; }
- unsigned getNumMethodParams() const { return NumMethodParams; }
- ParmVarDecl *getMethodParamDecl(unsigned i) {
- assert(i < getNumMethodParams() && "Illegal param #");
- return ParamInfo[i];
- }
+ Selector getSelector() const { return SelName; }
+ QualType getResultType() const { return MethodDeclType; }
+
int getNumParams() const { return NumMethodParams; }
ParmVarDecl *getParamDecl(int i) const {
assert(i < getNumParams() && "Illegal param #");