diff options
| -rw-r--r-- | Driver/RewriteObjC.cpp | 5 | ||||
| -rw-r--r-- | lib/Analysis/CFRefCount.cpp | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/Driver/RewriteObjC.cpp b/Driver/RewriteObjC.cpp index 641da1877d..56f3b3d0f4 100644 --- a/Driver/RewriteObjC.cpp +++ b/Driver/RewriteObjC.cpp @@ -1992,10 +1992,9 @@ Stmt *RewriteObjC::SynthMessageExpr(ObjCMessageExpr *Exp) { FunctionDecl *MsgSendStretFlavor = 0; if (ObjCMethodDecl *mDecl = Exp->getMethodDecl()) { QualType resultType = mDecl->getResultType(); - if (resultType.getCanonicalType()->isStructureType() - || resultType.getCanonicalType()->isUnionType()) + if (resultType->isStructureType() || resultType->isUnionType()) MsgSendStretFlavor = MsgSendStretFunctionDecl; - else if (resultType.getCanonicalType()->isRealFloatingType()) + else if (resultType->isRealFloatingType()) MsgSendFlavor = MsgSendFpretFunctionDecl; } diff --git a/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp index 17ad4481d3..319318f990 100644 --- a/lib/Analysis/CFRefCount.cpp +++ b/lib/Analysis/CFRefCount.cpp @@ -1462,8 +1462,7 @@ static QualType GetReturnType(Expr* RetE, ASTContext& Ctx) { QualType RetTy = RetE->getType(); // FIXME: We aren't handling id<...>. - const PointerType* PT = RetTy.getCanonicalType()->getAsPointerType(); - + const PointerType* PT = RetTy->getAsPointerType(); if (!PT) return RetTy; |