Uncomment some commented out code.

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

diff --git a/lib/CodeGen/CGCXX.cpp b/lib/CodeGen/CGCXX.cpp
index 20b2bdcd5e188fe5542796facba6d0c1deffdde4..bbaa226c2186e573d3202c1da9cdd0a22df60224 100644 (file)
--- a/lib/CodeGen/CGCXX.cpp
+++ b/lib/CodeGen/CGCXX.cpp
@@ -894,9 +894,9 @@ public:
 
         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 @@ public:
                                            FPT->isVariadic());
           
           m = wrap(CGM.GetAddrOfFunction(MD, Ty));
-//        }
+        }
 
         OverrideMethod(MD, m, MorallyVirtual, Offset);
       }

diff --git a/test/CodeGenCXX/virtual-base-cast.cpp b/test/CodeGenCXX/virtual-base-cast.cpp
index 9a728a82248c4585be7f129b5f208404a99038bb..a825120ad2294c45f309a1055a52d62dd1211a82 100644 (file)
--- a/test/CodeGenCXX/virtual-base-cast.cpp
+++ b/test/CodeGenCXX/virtual-base-cast.cpp
@@ -6,4 +6,4 @@ struct C : virtual B { virtual ~C(); };
 
 void f(C *c) {
   A* a = c;
-}
\ No newline at end of file
+}