[cfe-commits] r54101 - in /cfe/trunk: include/clang/AST/DeclObjC.h lib/Sema/SemaDeclObjC.cpp

[Chris Lattner]

Author: lattner
Date: Sat Jul 26 15:50:02 2008
New Revision: 54101

URL: http://llvm.org/viewvc/llvm-project?rev=54101&view=rev
Log:
remove a helper method.

Modified:
    cfe/trunk/include/clang/AST/DeclObjC.h
    cfe/trunk/lib/Sema/SemaDeclObjC.cpp

Modified: cfe/trunk/include/clang/AST/DeclObjC.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DeclObjC.h?rev=54101&r1=54100&r2=54101&view=diff

==============================================================================
--- cfe/trunk/include/clang/AST/DeclObjC.h (original)
+++ cfe/trunk/include/clang/AST/DeclObjC.h Sat Jul 26 15:50:02 2008
@@ -1175,7 +1175,6 @@
                                   IdentifierInfo *Id, QualType T,
                                   PropertyControl propControl = None);
   QualType getType() const { return DeclType; }
-  QualType getCanonicalType() const { return DeclType.getCanonicalType(); }
   
   PropertyAttributeKind getPropertyAttributes() const {
     return PropertyAttributeKind(PropertyAttributes);

Modified: cfe/trunk/lib/Sema/SemaDeclObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclObjC.cpp?rev=54101&r1=54100&r2=54101&view=diff

==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclObjC.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclObjC.cpp Sat Jul 26 15:50:02 2008
@@ -279,7 +279,8 @@
          Property->getName(), "getter", inheritedName, 
          SourceRange());
   
-  if (Property->getCanonicalType() != SuperProperty->getCanonicalType())
+  if (Context.getCanonicalType(Property->getType()) != 
+          Context.getCanonicalType(SuperProperty->getType()))
     Diag(Property->getLocation(), diag::warn_property_type,
          Property->getType().getAsString(),  
          inheritedName);
@@ -1145,7 +1146,8 @@
       return 0;
     }
     // Check that type of property and its ivar match. 
-    if (Ivar->getCanonicalType() != property->getCanonicalType()) {
+    if (Context.getCanonicalType(Ivar->getType()) !=
+        Context.getCanonicalType(property->getType())) {
       Diag(PropertyLoc, diag::error_property_ivar_type, property->getName(),
            Ivar->getName());
       return 0;