From c3a9d7dfbf1ceaa238b18984da2596566840a569 Mon Sep 17 00:00:00 2001 From: Frederic Riss Date: Thu, 20 Nov 2014 15:46:59 +0000 Subject: [PATCH] Prepare for the DIBuilder populating DISubprogram's Variables with null. This is a followup to r222373. A better solution to the problem solved there is to not create the leaked nodes at all (we know that they will never be used for forward declared functions anyway). To avoid bot breakage in the interval between the cfe and llvm commits, add a check that the nMDNode is not null before deleting it. This code can completely go away after the LLVM part is in. llvm-svn: 222433 --- clang/lib/CodeGen/CGDebugInfo.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp index 03a0cd9..343b343 100644 --- a/clang/lib/CodeGen/CGDebugInfo.cpp +++ b/clang/lib/CodeGen/CGDebugInfo.cpp @@ -3417,7 +3417,8 @@ void CGDebugInfo::finalize() { // to get RAUWed upon DIBuilder finalization. Do not leak these // nodes for the temporary functions we are about to delete. if (FwdDecl.isSubprogram()) - llvm::MDNode::deleteTemporary(llvm::DISubprogram(FwdDecl).getVariablesNodes()); + if (llvm::MDNode *Vars = llvm::DISubprogram(FwdDecl).getVariablesNodes()) + llvm::MDNode::deleteTemporary(Vars); FwdDecl.replaceAllUsesWith(CGM.getLLVMContext(), llvm::DIDescriptor(cast(VH))); -- 2.7.4