diff options
| -rw-r--r-- | lib/Analysis/BugReporter.cpp | 2 | ||||
| -rw-r--r-- | lib/CodeGen/CGCall.cpp | 4 | ||||
| -rw-r--r-- | lib/CodeGen/CodeGenFunction.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/Analysis/BugReporter.cpp b/lib/Analysis/BugReporter.cpp index a89542d4c1..1b013200b9 100644 --- a/lib/Analysis/BugReporter.cpp +++ b/lib/Analysis/BugReporter.cpp @@ -471,7 +471,7 @@ public: FullSourceLoc L(S->getLocStart(), BR.getSourceManager()); - if (VD->getType()->isPointerLikeType()) { + if (VD->getType()->isPointerType() || VD->getType()->isReferenceType()) { std::string msg = "'" + std::string(VD->getNameAsString()) + "' now aliases '" + MostRecent->getNameAsString() + "'"; diff --git a/lib/CodeGen/CGCall.cpp b/lib/CodeGen/CGCall.cpp index 6de07e165e..e560bfd82f 100644 --- a/lib/CodeGen/CGCall.cpp +++ b/lib/CodeGen/CGCall.cpp @@ -525,8 +525,8 @@ void X86_64ABIInfo::classify(QualType Ty, } else if (const EnumType *ET = Ty->getAsEnumType()) { // Classify the underlying integer type. classify(ET->getDecl()->getIntegerType(), Context, OffsetBase, Lo, Hi); - } else if (Ty->isPointerLikeType() || Ty->isBlockPointerType() || - Ty->isObjCQualifiedIdType() || + } else if (Ty->isPointerType() || Ty->isReferenceType() || + Ty->isBlockPointerType() || Ty->isObjCQualifiedIdType() || Ty->isObjCQualifiedInterfaceType()) { Current = Integer; } else if (const VectorType *VT = Ty->getAsVectorType()) { diff --git a/lib/CodeGen/CodeGenFunction.cpp b/lib/CodeGen/CodeGenFunction.cpp index 5fb0b2babe..2f09734666 100644 --- a/lib/CodeGen/CodeGenFunction.cpp +++ b/lib/CodeGen/CodeGenFunction.cpp @@ -82,8 +82,8 @@ bool CodeGenFunction::isObjCPointerType(QualType T) { bool CodeGenFunction::hasAggregateLLVMType(QualType T) { // FIXME: Use positive checks instead of negative ones to be more // robust in the face of extension. - return !isObjCPointerType(T) &&!T->isRealType() && !T->isPointerLikeType() && - !T->isVoidType() && !T->isVectorType() && !T->isFunctionType() && + return !isObjCPointerType(T) &&!T->isRealType() && !T->isPointerType() && + !T->isReferenceType() && !T->isVoidType() && !T->isVectorType() && !T->isFunctionType() && !T->isBlockPointerType(); } |