<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On 15 February 2015 at 00:16, Larisse Voufo <span dir="ltr"><<a href="mailto:lvoufo@google.com" target="_blank">lvoufo@google.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: lvoufo<br>
Date: Sun Feb 15 02:16:37 2015<br>
New Revision: 229291<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=229291&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=229291&view=rev</a><br>
Log:<br>
More on fixing sized deallocation implementation logic: Fix PR21754.<br>
<br>
Added:<br>
    cfe/trunk/test/CodeGenCXX/pr21754.cpp<br>
Modified:<br>
    cfe/trunk/lib/CodeGen/CodeGenModule.cpp<br>
<br>
Modified: cfe/trunk/lib/CodeGen/CodeGenModule.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenModule.cpp?rev=229291&r1=229290&r2=229291&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenModule.cpp?rev=229291&r1=229290&r2=229291&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/CodeGen/CodeGenModule.cpp (original)<br>
+++ cfe/trunk/lib/CodeGen/CodeGenModule.cpp Sun Feb 15 02:16:37 2015<br>
@@ -1617,11 +1617,14 @@ CodeGenModule::GetOrCreateLLVMFunction(S<br>
       DeferredDecls.erase(DDI);<br>
<br>
       // Otherwise, if this is a sized deallocation function, emit a weak<br>
-      // definition for it at the end of the translation unit.<br>
-    } else if (D && cast<FunctionDecl>(D)<br>
-                        ->getCorrespondingUnsizedGlobalDeallocationFunction()) {<br>
-      if (getLangOpts().DefaultSizedDelete)<br>
-        addDeferredDeclToEmit(F, GD);<br>
+      // definition for it at the end of the translation unit (if allowed),<br>
+      // unless the sized deallocation function is aliased.<br>
+    } else if (D &&<br>
+               cast<FunctionDecl>(D)<br>
+                  ->getCorrespondingUnsizedGlobalDeallocationFunction() &&<br>
+               !getLangOpts().DefaultSizedDelete &&<br>
+               !D->hasAttr<AliasAttr>()) {<br>
+      addDeferredDeclToEmit(F, GD);<br>
<br>
       // Otherwise, there are cases we have to worry about where we're<br>
       // using a declaration for which we must emit a definition but where<br>
<br>
Added: cfe/trunk/test/CodeGenCXX/pr21754.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/pr21754.cpp?rev=229291&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/pr21754.cpp?rev=229291&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenCXX/pr21754.cpp (added)<br>
+++ cfe/trunk/test/CodeGenCXX/pr21754.cpp Sun Feb 15 02:16:37 2015<br>
@@ -0,0 +1,13 @@<br>
+// RUN: %clang -cc1 -emit-llvm -triple x86_64-unknown-unknown -std=c++1y %s -o -<br>
+// RUN: %clang -cc1 -emit-llvm -triple x86_64-unknown-unknown -std=c++1y %s -fdef-sized-delete -o -<br>
+// RUN: %clang -cc1 -emit-llvm -triple x86_64-unknown-unknown -std=c++11 -fsized-deallocation %s -o -<br>
+// RUN: %clang -cc1 -emit-llvm -triple x86_64-unknown-unknown -std=c++11 -fsized-deallocation -fdef-sized-delete %s -o -<br>
+// RUN: %clang -cc1 -emit-llvm -triple x86_64-unknown-unknown -std=c++11 %s -o -<br></blockquote><div><br></div><div>Don't all these RUN lines need a " | FileCheck" on the end?</div><div><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+<br>
+// CHECK-UNSIZED-NOT: _ZdlPvm<br>
+// CHECK-UNSIZED-NOT: _ZdaPvm<br>
+<br>
+void operator delete(void*, unsigned long) throw() __attribute__((alias("foo")));<br>
+extern "C" void foo(void*, unsigned long) {}<br>
+<br>
+// CHECK-DAG: @_ZdlPvm = alias void (i8*, i64)* @my_delete<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu" target="_blank">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div>