From 0c691d029a2a28b5337325e0c49c90ce9e8bfba6 Mon Sep 17 00:00:00 2001 From: Larisse Voufo Date: Sun, 15 Feb 2015 08:16:37 +0000 Subject: More on fixing sized deallocation implementation logic: Fix PR21754. llvm-svn: 229291 --- clang/lib/CodeGen/CodeGenModule.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'clang/lib/CodeGen/CodeGenModule.cpp') diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index fdcbe2a42e8..ea7da8c5ce7 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -1617,11 +1617,14 @@ CodeGenModule::GetOrCreateLLVMFunction(StringRef MangledName, DeferredDecls.erase(DDI); // Otherwise, if this is a sized deallocation function, emit a weak - // definition for it at the end of the translation unit. - } else if (D && cast(D) - ->getCorrespondingUnsizedGlobalDeallocationFunction()) { - if (getLangOpts().DefaultSizedDelete) - addDeferredDeclToEmit(F, GD); + // definition for it at the end of the translation unit (if allowed), + // unless the sized deallocation function is aliased. + } else if (D && + cast(D) + ->getCorrespondingUnsizedGlobalDeallocationFunction() && + !getLangOpts().DefaultSizedDelete && + !D->hasAttr()) { + addDeferredDeclToEmit(F, GD); // Otherwise, there are cases we have to worry about where we're // using a declaration for which we must emit a definition but where -- cgit v1.2.3