replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactoring of my last patch. 

llvm-svn: 71248
This commit is contained in:
Fariborz Jahanian 2009-05-08 20:20:55 +00:00
parent c3a3cb47d2
commit fe9e3940eb
3 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/lib/Sema/Sema.h
View File

@ -1270,6 +1270,9 @@ public:
// Expression Parsing Callbacks: SemaExpr.cpp.
bool DiagnoseUseOfDecl(NamedDecl *D, SourceLocation Loc);
bool DiagnosePropertyAccessorMismatch(ObjCPropertyDecl *PD,
ObjCMethodDecl *Getter,
SourceLocation Loc);
// Primary Expressions.
virtual SourceRange getExprRange(ExprTy *E) const;

39
clang/lib/Sema/SemaDeclObjC.cpp
View File

@ -19,6 +19,26 @@
#include "clang/Parse/DeclSpec.h"
using namespace clang;
bool Sema::DiagnosePropertyAccessorMismatch(ObjCPropertyDecl *property,
ObjCMethodDecl *GetterMethod,
SourceLocation Loc) {
if (GetterMethod &&
GetterMethod->getResultType() != property->getType()) {
AssignConvertType result = Incompatible;
if (Context.isObjCObjectPointerType(property->getType()))
result = CheckAssignmentConstraints(property->getType(),
GetterMethod->getResultType());
if (result != Compatible) {
Diag(Loc, diag::warn_accessor_property_type_mismatch)
<< property->getDeclName()
<< GetterMethod->getSelector();
Diag(GetterMethod->getLocation(), diag::note_declared_at);
return true;
}
}
return false;
}
/// ActOnStartOfObjCMethodDef - This routine sets up parameters; invisible
/// and user declared, in the method definition's AST.
void Sema::ActOnStartOfObjCMethodDef(Scope *FnBodyScope, DeclPtrTy D) {
@ -1312,22 +1332,9 @@ void Sema::ProcessPropertyDecl(ObjCPropertyDecl *property,
GetterMethod = CD->getInstanceMethod(Context, property->getGetterName());
SetterMethod = CD->getInstanceMethod(Context, property->getSetterName());
if (GetterMethod &&
GetterMethod->getResultType() != property->getType()) {
AssignConvertType result = Incompatible;
if (Context.isObjCObjectPointerType(property->getType()))
result = CheckAssignmentConstraints(property->getType(),
GetterMethod->getResultType());
if (result != Compatible) {
Diag(property->getLocation(),
diag::warn_accessor_property_type_mismatch)
<< property->getDeclName()
<< GetterMethod->getSelector();
Diag(GetterMethod->getLocation(), diag::note_declared_at);
}
}
DiagnosePropertyAccessorMismatch(property, GetterMethod,
property->getLocation());
if (SetterMethod) {
if (Context.getCanonicalType(SetterMethod->getResultType())
!= Context.VoidTy)

13
clang/lib/Sema/SemaExpr.cpp
View File

@ -2099,17 +2099,8 @@ Sema::ActOnMemberReferenceExpr(Scope *S, ExprArg Base, SourceLocation OpLoc,
QualType ResTy = PD->getType();
Selector Sel = PP.getSelectorTable().getNullarySelector(&Member);
ObjCMethodDecl *Getter = IFace->lookupInstanceMethod(Context, Sel);
if (Getter) {
AssignConvertType result =
CheckAssignmentConstraints(PD->getType(), Getter->getResultType());
if (result != Compatible) {
Diag(MemberLoc, diag::warn_accessor_property_type_mismatch)
<< PD->getDeclName() << Sel;
Diag(Getter->getLocation(), diag::note_declared_at);
ResTy = Getter->getResultType();
}
}
if (DiagnosePropertyAccessorMismatch(PD, Getter, MemberLoc))
ResTy = Getter->getResultType();
return Owned(new (Context) ObjCPropertyRefExpr(PD, ResTy,
MemberLoc, BaseExpr));
}