From aa421ea8af28cd2a8ecb64310b9ecf9d70c9bb37 Mon Sep 17 00:00:00 2001 From: Argyrios Kyrtzidis Date: Sun, 6 Nov 2011 18:58:07 +0000 Subject: [arcmt] Make PropertiesRewriter::getPropertyType return the unqualified type. llvm-svn: 143884 --- clang/lib/ARCMigrate/TransProperties.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'clang/lib') diff --git a/clang/lib/ARCMigrate/TransProperties.cpp b/clang/lib/ARCMigrate/TransProperties.cpp index 85eb156935c..1512e4e96d3 100644 --- a/clang/lib/ARCMigrate/TransProperties.cpp +++ b/clang/lib/ARCMigrate/TransProperties.cpp @@ -125,8 +125,7 @@ public: I = AtProps.begin(), E = AtProps.end(); I != E; ++I) { SourceLocation atLoc = SourceLocation::getFromRawEncoding(I->first); PropsTy &props = I->second; - QualType ty = getPropertyType(props); - if (!ty->isObjCRetainableType()) + if (!getPropertyType(props)->isObjCRetainableType()) continue; if (hasIvarWithExplicitOwnership(props)) continue; @@ -486,11 +485,11 @@ private: QualType getPropertyType(PropsTy &props) const { assert(!props.empty()); - QualType ty = props[0].PropD->getType(); + QualType ty = props[0].PropD->getType().getUnqualifiedType(); #ifndef NDEBUG for (PropsTy::iterator I = props.begin(), E = props.end(); I != E; ++I) - assert(ty == I->PropD->getType()); + assert(ty == I->PropD->getType().getUnqualifiedType()); #endif return ty; -- cgit v1.2.3