Author: kcc Date: Thu Jan 9 03:22:32 2014 New Revision: 198857 URL: http://llvm.org/viewvc/llvm-project?rev=198857&view=rev Log: Fix leak in lib/CodeGen/CGException.cpp, PR18318
Summary: This fixes the leak described in http://llvm.org/bugs/show_bug.cgi?id=18318 Reviewers: chandlerc, dblaikie Reviewed By: chandlerc CC: cfe-commits Differential Revision: http://llvm-reviews.chandlerc.com/D2474 Modified: cfe/trunk/lib/CodeGen/CGCleanup.h cfe/trunk/lib/CodeGen/CGException.cpp Modified: cfe/trunk/lib/CodeGen/CGCleanup.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGCleanup.h?rev=198857&r1=198856&r2=198857&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/CGCleanup.h (original) +++ cfe/trunk/lib/CodeGen/CGCleanup.h Thu Jan 9 03:22:32 2014 @@ -194,6 +194,15 @@ public: return getHandlers()[I]; } + // Clear all handler blocks. + // FIXME: it's better to always call clearHandlerBlocks in DTOR and have a + // 'takeHandler' or some such function which removes ownership from the + // EHCatchScope object if the handlers should live longer than EHCatchScope. + void clearHandlerBlocks() { + for (unsigned I = 0, N = getNumHandlers(); I != N; ++I) + delete getHandler(I).Block; + } + typedef const Handler *iterator; iterator begin() const { return getHandlers(); } iterator end() const { return getHandlers() + getNumHandlers(); } Modified: cfe/trunk/lib/CodeGen/CGException.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGException.cpp?rev=198857&r1=198856&r2=198857&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/CGException.cpp (original) +++ cfe/trunk/lib/CodeGen/CGException.cpp Thu Jan 9 03:22:32 2014 @@ -1244,6 +1244,7 @@ void CodeGenFunction::ExitCXXTryStmt(con // If the catch was not required, bail out now. if (!CatchScope.hasEHBranches()) { + CatchScope.clearHandlerBlocks(); EHStack.popCatch(); return; } _______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
