remove a helper method.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@54101 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/AST/DeclObjC.h b/include/clang/AST/DeclObjC.h
index 451dc71097abf1c54e17d5601c37187e2b80ee0a..41a030d0e008f00b7dcae67681299a0790859662 100644 (file)
--- a/include/clang/AST/DeclObjC.h
+++ b/include/clang/AST/DeclObjC.h
@@ -1175,7 +1175,6 @@ public:
                                   IdentifierInfo *Id, QualType T,
                                   PropertyControl propControl = None);
   QualType getType() const { return DeclType; }
-  QualType getCanonicalType() const { return DeclType.getCanonicalType(); }
   
   PropertyAttributeKind getPropertyAttributes() const {
     return PropertyAttributeKind(PropertyAttributes);

diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index 07cc890fde3c92eb5eafdba1b7be13599abeedc5..d3e2ed3b1d6a22be512cf7b9c3d6cd4a0a3391e0 100644 (file)
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -279,7 +279,8 @@ Sema::DiagnosePropertyMismatch(ObjCPropertyDecl *Property,
          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 @@ Sema::DeclTy *Sema::ActOnPropertyImplDecl(SourceLocation AtLoc,
       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;