commit d4271f63432647e695eb3b2e56e6db0b0f387f4d
author Daniel Dunbar <daniel@zuster.org> Sat Apr 18 08:54:40 2009 +0000
committer Daniel Dunbar <daniel@zuster.org> Sat Apr 18 08:54:40 2009 +0000
tree f1dc0824b7b506c1f43af0ba59613481ba5172af
parent 3c1908152159ea8f056d13ae03829d96e5543cd5

Use getAsPointerType instead of using getCanonicalType directly.
 - <rdar://problem/6803995>


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

lib/CodeGen/CGExpr.cpp

diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index f98e674..a073c44 100644
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -825,13 +825,10 @@
                                                     BaseTypeSize));
   }
   
-  QualType T = E->getBase()->getType();
-  QualType ExprTy = getContext().getCanonicalType(T);
-  T = T->getAsPointerType()->getPointeeType();
-  LValue LV = 
-           LValue::MakeAddr(Builder.CreateGEP(Base, Idx, "arrayidx"),
-           ExprTy->getAsPointerType()->getPointeeType().getCVRQualifiers(),
-           getContext().getObjCGCAttrKind(T));
+  QualType T = E->getBase()->getType()->getAsPointerType()->getPointeeType();
+  LValue LV = LValue::MakeAddr(Builder.CreateGEP(Base, Idx, "arrayidx"),
+                               T.getCVRQualifiers(),
+                               getContext().getObjCGCAttrKind(T));
   if (getContext().getLangOptions().ObjC1 &&
       getContext().getLangOptions().getGCMode() != LangOptions::NonGC)
     LValue::SetObjCNonGC(LV, !E->isOBJCGCCandidate());
@@ -900,7 +897,7 @@
   if (E->isArrow()) {
     BaseValue = EmitScalarExpr(BaseExpr);
     const PointerType *PTy = 
-      cast<PointerType>(getContext().getCanonicalType(BaseExpr->getType()));
+      BaseExpr->getType()->getAsPointerType();
     if (PTy->getPointeeType()->isUnionType())
       isUnion = true;
     CVRQualifiers = PTy->getPointeeType().getCVRQualifiers();
@@ -1166,8 +1163,7 @@
   QualType ObjectTy;
   if (E->isArrow()) {
     BaseValue = EmitScalarExpr(BaseExpr);
-    const PointerType *PTy = 
-      cast<PointerType>(getContext().getCanonicalType(BaseExpr->getType()));
+    const PointerType *PTy = BaseExpr->getType()->getAsPointerType();
     ObjectTy = PTy->getPointeeType();
     CVRQualifiers = ObjectTy.getCVRQualifiers();
   } else {