commit 25168a59a231071fb6c8d5bfd8f80612d58f9fb1
author Chris Lattner <sabre@nondot.org> Sat Jul 26 21:30:36 2008 +0000
committer Chris Lattner <sabre@nondot.org> Sat Jul 26 21:30:36 2008 +0000
tree 11a097ccd02202a307cafae952c1f3b22fae6847
parent c5cff3042a9b78af61d0d39ec81c8516ebf9e05b

convert more code to use ASTContext to get canonical types instead
of doing it directly.  This is required for PR2189.


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

lib/AST/ASTContext.cpp

diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
index dedc9b8..47a3e3a 100644
--- a/lib/AST/ASTContext.cpp
+++ b/lib/AST/ASTContext.cpp
@@ -1542,15 +1542,15 @@
       lhs.getAddressSpace() != rhs.getAddressSpace())
     return false;
     
-  QualType ltype = cast<PointerType>(lhs.getCanonicalType())->getPointeeType();
-  QualType rtype = cast<PointerType>(rhs.getCanonicalType())->getPointeeType();
+  QualType ltype = lhs->getAsPointerType()->getPointeeType();
+  QualType rtype = rhs->getAsPointerType()->getPointeeType();
   
   return typesAreCompatible(ltype, rtype);
 }
 
 bool ASTContext::functionTypesAreCompatible(QualType lhs, QualType rhs) {
-  const FunctionType *lbase = cast<FunctionType>(lhs.getCanonicalType());
-  const FunctionType *rbase = cast<FunctionType>(rhs.getCanonicalType());
+  const FunctionType *lbase = lhs->getAsFunctionType();
+  const FunctionType *rbase = rhs->getAsFunctionType();
   const FunctionTypeProto *lproto = dyn_cast<FunctionTypeProto>(lbase);
   const FunctionTypeProto *rproto = dyn_cast<FunctionTypeProto>(rbase);
 
@@ -1673,8 +1673,8 @@
 /// C99 6.2.7p1: Two types have compatible types if their types are the 
 /// same. See 6.7.[2,3,5] for additional rules.
 bool ASTContext::typesAreCompatible(QualType LHS_NC, QualType RHS_NC) {
-  QualType LHS = LHS_NC.getCanonicalType();
-  QualType RHS = RHS_NC.getCanonicalType();
+  QualType LHS = getCanonicalType(LHS_NC);
+  QualType RHS = getCanonicalType(RHS_NC);
   
   // C++ [expr]: If an expression initially has the type "reference to T", the
   // type is adjusted to "T" prior to any further analysis, the expression