[cfe-commits] r83428 - in /cfe/trunk: lib/CodeGen/CGCXX.cpp test/CodeGenCXX/virtual-base-cast.cpp

[Anders Carlsson]

Author: andersca
Date: Tue Oct  6 18:02:00 2009
New Revision: 83428

URL: http://llvm.org/viewvc/llvm-project?rev=83428&view=rev
Log:
Uncomment some commented out code.

Modified:
    cfe/trunk/lib/CodeGen/CGCXX.cpp
    cfe/trunk/test/CodeGenCXX/virtual-base-cast.cpp

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

==============================================================================
--- cfe/trunk/lib/CodeGen/CGCXX.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGCXX.cpp Tue Oct  6 18:02:00 2009
@@ -894,9 +894,9 @@
 
         const CXXMethodDecl *MD = *mi;
         llvm::Constant *m = 0;
-//        if (const CXXDestructorDecl *Dtor = dyn_cast<CXXDestructorDecl>(MD))
-//          m = wrap(CGM.GetAddrOfCXXDestructor(Dtor, Dtor_Complete));
-//        else {
+        if (const CXXDestructorDecl *Dtor = dyn_cast<CXXDestructorDecl>(MD))
+          m = wrap(CGM.GetAddrOfCXXDestructor(Dtor, Dtor_Complete));
+        else {
           const FunctionProtoType *FPT = 
             MD->getType()->getAs<FunctionProtoType>();
           const llvm::Type *Ty =
@@ -904,7 +904,7 @@
                                            FPT->isVariadic());
           
           m = wrap(CGM.GetAddrOfFunction(MD, Ty));
-//        }
+        }
 
         OverrideMethod(MD, m, MorallyVirtual, Offset);
       }

Modified: cfe/trunk/test/CodeGenCXX/virtual-base-cast.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/virtual-base-cast.cpp?rev=83428&r1=83427&r2=83428&view=diff

==============================================================================
--- cfe/trunk/test/CodeGenCXX/virtual-base-cast.cpp (original)
+++ cfe/trunk/test/CodeGenCXX/virtual-base-cast.cpp Tue Oct  6 18:02:00 2009
@@ -6,4 +6,4 @@
 
 void f(C *c) {
   A* a = c;
-}
\ No newline at end of file
+}