remove a helper method.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@54101 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index 07cc890..d3e2ed3 100644
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -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;