diff options
author | Anders Carlsson <andersca@mac.com> | 2009-10-06 23:02:00 +0000 |
---|---|---|
committer | Anders Carlsson <andersca@mac.com> | 2009-10-06 23:02:00 +0000 |
commit | b703fd2216327edfea4037abe66d1dc386c5db5f (patch) | |
tree | 99153cca397e6894e8234930e572b20ffa83205d /clang | |
parent | da6822f584093a8c5ad4916dff3cb153f5c1d9cb (diff) | |
download | bcm5719-llvm-b703fd2216327edfea4037abe66d1dc386c5db5f.tar.gz bcm5719-llvm-b703fd2216327edfea4037abe66d1dc386c5db5f.zip |
Uncomment some commented out code.
llvm-svn: 83428
Diffstat (limited to 'clang')
-rw-r--r-- | clang/lib/CodeGen/CGCXX.cpp | 8 | ||||
-rw-r--r-- | clang/test/CodeGenCXX/virtual-base-cast.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/clang/lib/CodeGen/CGCXX.cpp b/clang/lib/CodeGen/CGCXX.cpp index 20b2bdcd5e1..bbaa226c218 100644 --- a/clang/lib/CodeGen/CGCXX.cpp +++ b/clang/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/clang/test/CodeGenCXX/virtual-base-cast.cpp b/clang/test/CodeGenCXX/virtual-base-cast.cpp index 9a728a82248..a825120ad22 100644 --- a/clang/test/CodeGenCXX/virtual-base-cast.cpp +++ b/clang/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 +} |