maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Get rid of the implicit deref call when calling member functions where the base is a pointer. 

llvm-svn: 70562
This commit is contained in:
Anders Carlsson 2009-05-01 18:34:30 +00:00
parent 62a3124fb8
commit bfdea0f136
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
clang/lib/Sema/SemaOverload.cpp
View File

@ -1928,8 +1928,10 @@ Sema::TryObjectArgumentInitialization(Expr *From, CXXMethodDecl *Method) {
// We need to have an object of class type.
QualType FromType = From->getType();
if (!FromType->isRecordType())
return ICS;
if (const PointerType *PT = FromType->getAsPointerType())
FromType = PT->getPointeeType();
assert(FromType->isRecordType());
// The implicit object parmeter is has the type "reference to cv X",
// where X is the class of which the function is a member
@ -1972,22 +1974,33 @@ Sema::TryObjectArgumentInitialization(Expr *From, CXXMethodDecl *Method) {
/// expression.
bool
Sema::PerformObjectArgumentInitialization(Expr *&From, CXXMethodDecl *Method) {
QualType ImplicitParamType
= Method->getThisType(Context)->getAsPointerType()->getPointeeType();
QualType FromRecordType, DestType;
QualType ImplicitParamRecordType =
Method->getThisType(Context)->getAsPointerType()->getPointeeType();
if (const PointerType *PT = From->getType()->getAsPointerType()) {
FromRecordType = PT->getPointeeType();
DestType = Method->getThisType(Context);
} else {
FromRecordType = From->getType();
DestType = ImplicitParamRecordType;
}
ImplicitConversionSequence ICS
= TryObjectArgumentInitialization(From, Method);
if (ICS.ConversionKind == ImplicitConversionSequence::BadConversion)
return Diag(From->getSourceRange().getBegin(),
diag::err_implicit_object_parameter_init)
<< ImplicitParamType << From->getType() << From->getSourceRange();
<< ImplicitParamRecordType << FromRecordType << From->getSourceRange();
if (ICS.Standard.Second == ICK_Derived_To_Base &&
CheckDerivedToBaseConversion(From->getType(), ImplicitParamType,
CheckDerivedToBaseConversion(FromRecordType,
ImplicitParamRecordType,
From->getSourceRange().getBegin(),
From->getSourceRange()))
return true;
ImpCastExprToType(From, ImplicitParamType, /*isLvalue=*/true);
ImpCastExprToType(From, DestType, /*isLvalue=*/true);
return false;
}
@ -4048,10 +4061,7 @@ Sema::BuildCallToMemberFunction(Scope *S, Expr *MemExprE,
// Extract the object argument.
Expr *ObjectArg = MemExpr->getBase();
if (MemExpr->isArrow())
ObjectArg = new (Context) UnaryOperator(ObjectArg, UnaryOperator::Deref,
ObjectArg->getType()->getAsPointerType()->getPointeeType(),
ObjectArg->getLocStart());
CXXMethodDecl *Method = 0;
if (OverloadedFunctionDecl *Ovl
= dyn_cast<OverloadedFunctionDecl>(MemExpr->getMemberDecl())) {