[cfe-commits] r77374 - /cfe/trunk/lib/CodeGen/CGExprScalar.cpp

[Fariborz Jahanian]

Author: fjahanian
Date: Tue Jul 28 17:00:58 2009
New Revision: 77374

URL: http://llvm.org/viewvc/llvm-project?rev=77374&view=rev
Log:
ir-gen derived-to-base conversion in implicit casts.


Modified:
    cfe/trunk/lib/CodeGen/CGExprScalar.cpp

Modified: cfe/trunk/lib/CodeGen/CGExprScalar.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExprScalar.cpp?rev=77374&r1=77373&r2=77374&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CGExprScalar.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGExprScalar.cpp Tue Jul 28 17:00:58 2009
@@ -440,8 +440,22 @@
   // pointer type.
   if (isa<llvm::PointerType>(DstTy)) {
     // The source value may be an integer, or a pointer.
-    if (isa<llvm::PointerType>(Src->getType()))
+    if (isa<llvm::PointerType>(Src->getType())) {
+      // Some heavy lifting for derived to base conversion.
+      if (const PointerType *PT = SrcType->getAsPointerType()) {
+        QualType SrcClassTy = PT->getPointeeType();
+        if (const RecordType *RT = SrcClassTy->getAsRecordType())
+          if (CXXRecordDecl *ClassDecl =
+              dyn_cast<CXXRecordDecl>(RT->getDecl())) {
+            QualType DstClassType = DstType->getPointeeType();
+            if (const RecordType *DRT = DstClassType->getAsRecordType())
+              if (CXXRecordDecl *BaseClassDecl = 
+                    dyn_cast<CXXRecordDecl>(DRT->getDecl()))
+                Src = CGF.AddressCXXOfBaseClass(Src, ClassDecl, BaseClassDecl);
+          }
+      }
       return Builder.CreateBitCast(Src, DstTy, "conv");
+    }
     assert(SrcType->isIntegerType() && "Not ptr->ptr or int->ptr conversion?");
     // First, convert to the correct width so that we control the kind of
     // extension.