From b397e43dea379bd436dda3fa92da449deaf70244 Mon Sep 17 00:00:00 2001 From: Fariborz Jahanian Date: Mon, 15 Mar 2010 18:36:00 +0000 Subject: objective-c++ must take into account qualifiers when considering valid objc pointer converions. llvm-svn: 98557 --- clang/lib/Sema/SemaOverload.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'clang/lib') diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp index ff59fc3a7d3..a58b33f97f2 100644 --- a/clang/lib/Sema/SemaOverload.cpp +++ b/clang/lib/Sema/SemaOverload.cpp @@ -1135,6 +1135,12 @@ bool Sema::isObjCPointerConversion(QualType FromType, QualType ToType, // Objective C++: We're able to convert from a pointer to an // interface to a pointer to a different interface. if (Context.canAssignObjCInterfaces(ToObjCPtr, FromObjCPtr)) { + const ObjCInterfaceType* LHS = ToObjCPtr->getInterfaceType(); + const ObjCInterfaceType* RHS = FromObjCPtr->getInterfaceType(); + if (getLangOptions().CPlusPlus && LHS && RHS && + !ToObjCPtr->getPointeeType().isAtLeastAsQualifiedAs( + FromObjCPtr->getPointeeType())) + return false; ConvertedType = ToType; return true; } -- cgit v1.2.3