From d5a05dd21ea252c45a3ba04822559614b822c641 Mon Sep 17 00:00:00 2001 From: Kostya Serebryany Date: Thu, 9 Jan 2014 09:22:32 +0000 Subject: [PATCH] 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 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@198857 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGCleanup.h | 9 +++++++++ lib/CodeGen/CGException.cpp | 1 + 2 files changed, 10 insertions(+) diff --git a/lib/CodeGen/CGCleanup.h b/lib/CodeGen/CGCleanup.h index 1bd6bba523..fed75bc9d8 100644 --- a/lib/CodeGen/CGCleanup.h +++ b/lib/CodeGen/CGCleanup.h @@ -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(); } diff --git a/lib/CodeGen/CGException.cpp b/lib/CodeGen/CGException.cpp index 5acb4537f3..8a43794281 100644 --- a/lib/CodeGen/CGException.cpp +++ b/lib/CodeGen/CGException.cpp @@ -1244,6 +1244,7 @@ void CodeGenFunction::ExitCXXTryStmt(const CXXTryStmt &S, bool IsFnTryBlock) { // If the catch was not required, bail out now. if (!CatchScope.hasEHBranches()) { + CatchScope.clearHandlerBlocks(); EHStack.popCatch(); return; } -- 2.40.0