[cfe-commits] r143884 - /cfe/trunk/lib/ARCMigrate/TransProperties.cpp

[Argyrios Kyrtzidis]

Author: akirtzidis
Date: Sun Nov  6 12:58:07 2011
New Revision: 143884

URL: http://llvm.org/viewvc/llvm-project?rev=143884&view=rev
Log:
[arcmt] Make PropertiesRewriter::getPropertyType return the unqualified type.

Modified:
    cfe/trunk/lib/ARCMigrate/TransProperties.cpp

Modified: cfe/trunk/lib/ARCMigrate/TransProperties.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/ARCMigrate/TransProperties.cpp?rev=143884&r1=143883&r2=143884&view=diff
==============================================================================
--- cfe/trunk/lib/ARCMigrate/TransProperties.cpp (original)
+++ cfe/trunk/lib/ARCMigrate/TransProperties.cpp Sun Nov  6 12:58:07 2011
@@ -125,8 +125,7 @@
            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 @@
 
   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;