<div dir="ltr">Good point, I've committed a similar change in r<span style="font-family:arial,sans-serif;font-size:13px">193061. I decided to go with 'replacement function' instead of 'non-placement' seeing as how placement-new isn't a replacement function.</span><div>
<span style="font-family:arial,sans-serif;font-size:13px"><br></span></div><div><span style="font-family:arial,sans-serif;font-size:13px">Thanks!</span></div><div><span style="font-family:arial,sans-serif;font-size:13px"><br>
</span></div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Sun, Oct 20, 2013 at 11:43 AM, Richard Smith <span dir="ltr"><<a href="mailto:richard@metafoo.co.uk" target="_blank">richard@metafoo.co.uk</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><p dir="ltr">The diagnostic wording is a little imprecise. Maybe "non-placement 'operator whatever' cannot ..."?</p>
<div class="HOEnZb"><div class="h5">
<div class="gmail_quote">On 19 Oct 2013 22:45, "David Majnemer" <<a href="mailto:david.majnemer@gmail.com" target="_blank">david.majnemer@gmail.com</a>> wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: majnemer<br>
Date: Sun Oct 20 00:40:29 2013<br>
New Revision: 193044<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=193044&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=193044&view=rev</a><br>
Log:<br>
Sema: Diagnose global replacement functions declared as inline<br>
<br>
This fixes PR17591.<br>
<br>
N.B. This actually goes beyond what the standard mandates by requiring<br>
the restriction to hold for declarations instead of definitions. This<br>
is believed to be a defect in the standard and an LWG issue has been<br>
submitted.<br>
<br>
Modified:<br>
cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td<br>
cfe/trunk/lib/Sema/SemaDecl.cpp<br>
cfe/trunk/test/SemaCXX/new-delete.cpp<br>
<br>
Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=193044&r1=193043&r2=193044&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=193044&r1=193043&r2=193044&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)<br>
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Sun Oct 20 00:40:29 2013<br>
@@ -5900,6 +5900,8 @@ def err_operator_new_delete_declared_in_<br>
"%0 cannot be declared inside a namespace">;<br>
def err_operator_new_delete_declared_static : Error<<br>
"%0 cannot be declared static in global scope">;<br>
+def err_operator_new_delete_declared_inline : Error<<br>
+ "%0 cannot be declared 'inline'">;<br>
def err_operator_new_delete_invalid_result_type : Error<<br>
"%0 must return type %1">;<br>
def err_operator_new_delete_dependent_result_type : Error<<br>
<br>
Modified: cfe/trunk/lib/Sema/SemaDecl.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDecl.cpp?rev=193044&r1=193043&r2=193044&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDecl.cpp?rev=193044&r1=193043&r2=193044&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Sema/SemaDecl.cpp (original)<br>
+++ cfe/trunk/lib/Sema/SemaDecl.cpp Sun Oct 20 00:40:29 2013<br>
@@ -6804,6 +6804,13 @@ Sema::ActOnFunctionDeclarator(Scope *S,<br>
NewFD->setType(Context.getFunctionType(FPT->getResultType(),<br>
FPT->getArgTypes(), EPI));<br>
}<br>
+<br>
+ // C++11 [replacement.functions]p3:<br>
+ // The program's definitions shall not be specified as inline.<br>
+ if (isInline && NewFD->isReplaceableGlobalAllocationFunction())<br>
+ Diag(D.getDeclSpec().getInlineSpecLoc(),<br>
+ diag::err_operator_new_delete_declared_inline)<br>
+ << NewFD->getDeclName();<br>
}<br>
<br>
// Filter out previous declarations that don't match the scope.<br>
<br>
Modified: cfe/trunk/test/SemaCXX/new-delete.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/new-delete.cpp?rev=193044&r1=193043&r2=193044&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/new-delete.cpp?rev=193044&r1=193043&r2=193044&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/SemaCXX/new-delete.cpp (original)<br>
+++ cfe/trunk/test/SemaCXX/new-delete.cpp Sun Oct 20 00:40:29 2013<br>
@@ -24,6 +24,8 @@ void* operator new(size_t, int*); // exp<br>
void* operator new(size_t, float*); // expected-note 3 {{candidate}}<br>
void* operator new(size_t, S); // expected-note 2 {{candidate}}<br>
<br>
+inline void operator delete(void *); // expected-error {{'operator delete' cannot be declared 'inline'}}<br>
+<br>
struct foo { };<br>
<br>
void good_news()<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>
</div></div></blockquote></div><br></div>