<div dir="ltr">Hello Eric,<br><br>One of added tests fails on the next builder:<br><a href="http://lab.llvm.org:8011/builders/llvm-clang-x86_64-expensive-checks-win/builds/8624">http://lab.llvm.org:8011/builders/llvm-clang-x86_64-expensive-checks-win/builds/8624</a><br><br>. . . <br>Failing Tests:<br> . . .<br> Clang :: SemaCXX/builtin-operator-new-delete.cpp<br><br>Please have a look?<br><br>It is not good idea to keep the bot red for too long. This hides new problem which later hard to track down.<br><br>Thanks<br><br>Galina<br><br></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Mar 21, 2018 at 12:19 PM, Eric Fiselier via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: ericwf<br>
Date: Wed Mar 21 12:19:48 2018<br>
New Revision: 328134<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=328134&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=328134&view=rev</a><br>
Log:<br>
[Builtins] Overload __builtin_operator_new/delete to allow forwarding to usual allocation/deallocation functions.<br>
<br>
Summary:<br>
Libc++'s default allocator uses `__builtin_operator_new` and `__builtin_operator_delete` in order to allow the calls to new/delete to be ellided. However, libc++ now needs to support over-aligned types in the default allocator. In order to support this without disabling the existing optimization Clang needs to support calling the aligned new overloads from the builtins.<br>
<br>
See <a href="http://llvm.org/PR22634" rel="noreferrer" target="_blank">llvm.org/PR22634</a> for more information about the libc++ bug.<br>
<br>
This patch changes `__builtin_operator_new`/`__<wbr>builtin_operator_delete` to call any usual `operator new`/`operator delete` function. It does this by performing overload resolution with the arguments passed to the builtin to determine which allocation function to call. If the selected function is not a usual allocation function a diagnostic is issued.<br>
<br>
One open issue is if the `align_val_t` overloads should be considered "usual" when `LangOpts::AlignedAllocation` is disabled.<br>
<br>
<br>
In order to allow libc++ to detect this new behavior the value for `__has_builtin(__builtin_<wbr>operator_new)` has been updated to `201802`.<br>
<br>
Reviewers: rsmith, majnemer, aaron.ballman, erik.pilkington, bogner, ahatanak<br>
<br>
Reviewed By: rsmith<br>
<br>
Subscribers: cfe-commits<br>
<br>
Differential Revision: <a href="https://reviews.llvm.org/D43047" rel="noreferrer" target="_blank">https://reviews.llvm.org/<wbr>D43047</a><br>
<br>
Added:<br>
cfe/trunk/test/CodeGenCXX/<wbr>builtin-operator-new-delete.<wbr>cpp<br>
cfe/trunk/test/SemaCXX/<wbr>builtin-operator-new-delete.<wbr>cpp<br>
Modified:<br>
cfe/trunk/include/clang/Basic/<wbr>Builtins.def<br>
cfe/trunk/include/clang/Basic/<wbr>DiagnosticSemaKinds.td<br>
cfe/trunk/include/clang/Sema/<wbr>Sema.h<br>
cfe/trunk/lib/CodeGen/<wbr>CGBuiltin.cpp<br>
cfe/trunk/lib/CodeGen/<wbr>CGExprCXX.cpp<br>
cfe/trunk/lib/CodeGen/<wbr>CodeGenFunction.h<br>
cfe/trunk/lib/Lex/<wbr>PPMacroExpansion.cpp<br>
cfe/trunk/lib/Sema/<wbr>SemaChecking.cpp<br>
cfe/trunk/lib/Sema/<wbr>SemaExprCXX.cpp<br>
<br>
Modified: cfe/trunk/include/clang/Basic/<wbr>Builtins.def<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/Builtins.def?rev=328134&r1=328133&r2=328134&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/include/<wbr>clang/Basic/Builtins.def?rev=<wbr>328134&r1=328133&r2=328134&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/include/clang/Basic/<wbr>Builtins.def (original)<br>
+++ cfe/trunk/include/clang/Basic/<wbr>Builtins.def Wed Mar 21 12:19:48 2018<br>
@@ -1371,8 +1371,8 @@ BUILTIN(__builtin_smulll_<wbr>overflow, "bSLL<br>
<br>
// Clang builtins (not available in GCC).<br>
BUILTIN(__builtin_addressof, "v*v&", "nct")<br>
-BUILTIN(__builtin_operator_<wbr>new, "v*z", "c")<br>
-BUILTIN(__builtin_operator_<wbr>delete, "vv*", "n")<br>
+BUILTIN(__builtin_operator_<wbr>new, "v*z", "tc")<br>
+BUILTIN(__builtin_operator_<wbr>delete, "vv*", "tn")<br>
BUILTIN(__builtin_char_memchr, "c*cC*iz", "n")<br>
<br>
// Safestack builtins<br>
<br>
Modified: cfe/trunk/include/clang/Basic/<wbr>DiagnosticSemaKinds.td<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=328134&r1=328133&r2=328134&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/include/<wbr>clang/Basic/<wbr>DiagnosticSemaKinds.td?rev=<wbr>328134&r1=328133&r2=328134&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/include/clang/Basic/<wbr>DiagnosticSemaKinds.td (original)<br>
+++ cfe/trunk/include/clang/Basic/<wbr>DiagnosticSemaKinds.td Wed Mar 21 12:19:48 2018<br>
@@ -7627,6 +7627,11 @@ def err_destroying_operator_<wbr>delete_not_u<br>
"alignment parameter">;<br>
def note_implicit_delete_this_in_<wbr>destructor_here : Note<<br>
"while checking implicit 'delete this' for virtual destructor">;<br>
+def err_builtin_operator_new_<wbr>delete_not_usual : Error<<br>
+ "call to '%select{__builtin_operator_<wbr>new|__builtin_operator_delete}<wbr>0' "<br>
+ "selects non-usual %select{allocation|<wbr>deallocation}0 function">;<br>
+def note_non_usual_function_<wbr>declared_here : Note<<br>
+ "non-usual %0 declared here">;<br>
<br>
// C++ literal operators<br>
def err_literal_operator_outside_<wbr>namespace : Error<<br>
<br>
Modified: cfe/trunk/include/clang/Sema/<wbr>Sema.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/Sema.h?rev=328134&r1=328133&r2=328134&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/include/<wbr>clang/Sema/Sema.h?rev=328134&<wbr>r1=328133&r2=328134&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/include/clang/Sema/<wbr>Sema.h (original)<br>
+++ cfe/trunk/include/clang/Sema/<wbr>Sema.h Wed Mar 21 12:19:48 2018<br>
@@ -10376,6 +10376,8 @@ private:<br>
ExprResult SemaBuiltinNontemporalOverload<wbr>ed(ExprResult TheCallResult);<br>
ExprResult SemaAtomicOpsOverloaded(<wbr>ExprResult TheCallResult,<br>
AtomicExpr::AtomicOp Op);<br>
+ ExprResult SemaBuiltinOperatorNewDeleteOv<wbr>erloaded(ExprResult TheCallResult,<br>
+ bool IsDelete);<br>
bool SemaBuiltinConstantArg(<wbr>CallExpr *TheCall, int ArgNum,<br>
llvm::APSInt &Result);<br>
bool SemaBuiltinConstantArgRange(<wbr>CallExpr *TheCall, int ArgNum,<br>
<br>
Modified: cfe/trunk/lib/CodeGen/<wbr>CGBuiltin.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGBuiltin.cpp?rev=328134&r1=328133&r2=328134&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/CodeGen/<wbr>CGBuiltin.cpp?rev=328134&r1=<wbr>328133&r2=328134&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/CodeGen/<wbr>CGBuiltin.cpp (original)<br>
+++ cfe/trunk/lib/CodeGen/<wbr>CGBuiltin.cpp Wed Mar 21 12:19:48 2018<br>
@@ -2611,11 +2611,12 @@ RValue CodeGenFunction::<wbr>EmitBuiltinExpr(<br>
case Builtin::BI__builtin_<wbr>addressof:<br>
return RValue::get(EmitLValue(E-><wbr>getArg(0)).getPointer());<br>
case Builtin::BI__builtin_operator_<wbr>new:<br>
- return EmitBuiltinNewDeleteCall(FD-><wbr>getType()->castAs<<wbr>FunctionProtoType>(),<br>
- E->getArg(0), false);<br>
+ return EmitBuiltinNewDeleteCall(<br>
+ E->getCallee()->getType()-><wbr>castAs<FunctionProtoType>(), E, false);<br>
case Builtin::BI__builtin_operator_<wbr>delete:<br>
- return EmitBuiltinNewDeleteCall(FD-><wbr>getType()->castAs<<wbr>FunctionProtoType>(),<br>
- E->getArg(0), true);<br>
+ return EmitBuiltinNewDeleteCall(<br>
+ E->getCallee()->getType()-><wbr>castAs<FunctionProtoType>(), E, true);<br>
+<br>
case Builtin::BI__noop:<br>
// __noop always evaluates to an integer literal zero.<br>
return RValue::get(ConstantInt::get(<wbr>IntTy, 0));<br>
<br>
Modified: cfe/trunk/lib/CodeGen/<wbr>CGExprCXX.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExprCXX.cpp?rev=328134&r1=328133&r2=328134&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/CodeGen/<wbr>CGExprCXX.cpp?rev=328134&r1=<wbr>328133&r2=328134&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/CodeGen/<wbr>CGExprCXX.cpp (original)<br>
+++ cfe/trunk/lib/CodeGen/<wbr>CGExprCXX.cpp Wed Mar 21 12:19:48 2018<br>
@@ -1307,19 +1307,19 @@ static RValue EmitNewDeleteCall(CodeGenF<br>
}<br>
<br>
RValue CodeGenFunction::<wbr>EmitBuiltinNewDeleteCall(const FunctionProtoType *Type,<br>
- const Expr *Arg,<br>
+ const CallExpr *TheCall,<br>
bool IsDelete) {<br>
CallArgList Args;<br>
- const Stmt *ArgS = Arg;<br>
- EmitCallArgs(Args, *Type->param_type_begin(), llvm::makeArrayRef(ArgS));<br>
+ EmitCallArgs(Args, Type->getParamTypes(), TheCall->arguments());<br>
// Find the allocation or deallocation function that we're calling.<br>
ASTContext &Ctx = getContext();<br>
DeclarationName Name = Ctx.DeclarationNames<br>
.getCXXOperatorName(IsDelete ? OO_Delete : OO_New);<br>
+<br>
for (auto *Decl : Ctx.getTranslationUnitDecl()-><wbr>lookup(Name))<br>
if (auto *FD = dyn_cast<FunctionDecl>(Decl))<br>
if (Ctx.hasSameType(FD->getType()<wbr>, QualType(Type, 0)))<br>
- return EmitNewDeleteCall(*this, cast<FunctionDecl>(Decl), Type, Args);<br>
+ return EmitNewDeleteCall(*this, FD, Type, Args);<br>
llvm_unreachable("predeclared global operator new/delete is missing");<br>
}<br>
<br>
<br>
Modified: cfe/trunk/lib/CodeGen/<wbr>CodeGenFunction.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenFunction.h?rev=328134&r1=328133&r2=328134&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/CodeGen/<wbr>CodeGenFunction.h?rev=328134&<wbr>r1=328133&r2=328134&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/CodeGen/<wbr>CodeGenFunction.h (original)<br>
+++ cfe/trunk/lib/CodeGen/<wbr>CodeGenFunction.h Wed Mar 21 12:19:48 2018<br>
@@ -2356,7 +2356,7 @@ public:<br>
CharUnits CookieSize = CharUnits());<br>
<br>
RValue EmitBuiltinNewDeleteCall(const FunctionProtoType *Type,<br>
- const Expr *Arg, bool IsDelete);<br>
+ const CallExpr *TheCallExpr, bool IsDelete);<br>
<br>
llvm::Value *EmitCXXTypeidExpr(const CXXTypeidExpr *E);<br>
llvm::Value *EmitDynamicCast(Address V, const CXXDynamicCastExpr *DCE);<br>
<br>
Modified: cfe/trunk/lib/Lex/<wbr>PPMacroExpansion.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/PPMacroExpansion.cpp?rev=328134&r1=328133&r2=328134&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/Lex/<wbr>PPMacroExpansion.cpp?rev=<wbr>328134&r1=328133&r2=328134&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/Lex/<wbr>PPMacroExpansion.cpp (original)<br>
+++ cfe/trunk/lib/Lex/<wbr>PPMacroExpansion.cpp Wed Mar 21 12:19:48 2018<br>
@@ -1801,12 +1801,21 @@ void Preprocessor::<wbr>ExpandBuiltinMacro(To<br>
[this](Token &Tok, bool &HasLexedNextToken) -> int {<br>
IdentifierInfo *II = ExpectFeatureIdentifierInfo(<wbr>Tok, *this,<br>
diag::err_feature_check_<wbr>malformed);<br>
+ const LangOptions &LangOpts = getLangOpts();<br>
if (!II)<br>
return false;<br>
- else if (II->getBuiltinID() != 0)<br>
+ else if (II->getBuiltinID() != 0) {<br>
+ switch (II->getBuiltinID()) {<br>
+ case Builtin::BI__builtin_operator_<wbr>new:<br>
+ case Builtin::BI__builtin_operator_<wbr>delete:<br>
+ // denotes date of behavior change to support calling arbitrary<br>
+ // usual allocation and deallocation functions. Required by libc++<br>
+ return 201802;<br>
+ default:<br>
+ return true;<br>
+ }<br>
return true;<br>
- else {<br>
- const LangOptions &LangOpts = getLangOpts();<br>
+ } else {<br>
return llvm::StringSwitch<bool>(II-><wbr>getName())<br>
.Case("__make_integer_seq", LangOpts.CPlusPlus)<br>
.Case("__type_pack_element", LangOpts.CPlusPlus)<br>
<br>
Modified: cfe/trunk/lib/Sema/<wbr>SemaChecking.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaChecking.cpp?rev=328134&r1=328133&r2=328134&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/Sema/<wbr>SemaChecking.cpp?rev=328134&<wbr>r1=328133&r2=328134&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/Sema/<wbr>SemaChecking.cpp (original)<br>
+++ cfe/trunk/lib/Sema/<wbr>SemaChecking.cpp Wed Mar 21 12:19:48 2018<br>
@@ -1097,20 +1097,14 @@ Sema::<wbr>CheckBuiltinFunctionCall(<wbr>FunctionD<br>
return ExprError();<br>
break;<br>
case Builtin::BI__builtin_operator_<wbr>new:<br>
- case Builtin::BI__builtin_operator_<wbr>delete:<br>
- if (!getLangOpts().CPlusPlus) {<br>
- Diag(TheCall->getExprLoc(), diag::err_builtin_requires_<wbr>language)<br>
- << (BuiltinID == Builtin::BI__builtin_operator_<wbr>new<br>
- ? "__builtin_operator_new"<br>
- : "__builtin_operator_delete")<br>
- << "C++";<br>
- return ExprError();<br>
- }<br>
- // CodeGen assumes it can find the global new and delete to call,<br>
- // so ensure that they are declared.<br>
- DeclareGlobalNewDelete();<br>
- break;<br>
-<br>
+ case Builtin::BI__builtin_operator_<wbr>delete: {<br>
+ bool IsDelete = BuiltinID == Builtin::BI__builtin_operator_<wbr>delete;<br>
+ ExprResult Res =<br>
+ SemaBuiltinOperatorNewDeleteOv<wbr>erloaded(TheCallResult, IsDelete);<br>
+ if (Res.isInvalid())<br>
+ CorrectDelayedTyposInExpr(<wbr>TheCallResult.get());<br>
+ return Res;<br>
+ }<br>
// check secure string manipulation functions where overflows<br>
// are detectable at compile time<br>
case Builtin::BI__builtin___memcpy_<wbr>chk:<br>
<br>
Modified: cfe/trunk/lib/Sema/<wbr>SemaExprCXX.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExprCXX.cpp?rev=328134&r1=328133&r2=328134&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/Sema/<wbr>SemaExprCXX.cpp?rev=328134&r1=<wbr>328133&r2=328134&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/Sema/<wbr>SemaExprCXX.cpp (original)<br>
+++ cfe/trunk/lib/Sema/<wbr>SemaExprCXX.cpp Wed Mar 21 12:19:48 2018<br>
@@ -1443,7 +1443,7 @@ namespace {<br>
CUDAPref = S.IdentifyCUDAPreference(<wbr>Caller, FD);<br>
}<br>
<br>
- operator bool() const { return FD; }<br>
+ explicit operator bool() const { return FD; }<br>
<br>
bool isBetterThan(const UsualDeallocFnInfo &Other, bool WantSize,<br>
bool WantAlign) const {<br>
@@ -2271,7 +2271,6 @@ static bool resolveAllocationOverload(<br>
llvm_unreachable("Unreachable, bad result from BestViableFunction");<br>
}<br>
<br>
-<br>
/// FindAllocationFunctions - Finds the overloads of operator new and delete<br>
/// that are appropriate for the allocation.<br>
bool Sema::FindAllocationFunctions(<wbr>SourceLocation StartLoc, SourceRange Range,<br>
@@ -3343,6 +3342,128 @@ Sema::ActOnCXXDelete(<wbr>SourceLocation Star<br>
return Result;<br>
}<br>
<br>
+static bool resolveBuiltinNewDeleteOverloa<wbr>d(Sema &S, CallExpr *TheCall,<br>
+ bool IsDelete,<br>
+ FunctionDecl *&Operator) {<br>
+<br>
+ DeclarationName NewName = S.Context.DeclarationNames.<wbr>getCXXOperatorName(<br>
+ IsDelete ? OO_Delete : OO_New);<br>
+<br>
+ LookupResult R(S, NewName, TheCall->getLocStart(), Sema::LookupOrdinaryName);<br>
+ S.LookupQualifiedName(R, S.Context.<wbr>getTranslationUnitDecl());<br>
+ assert(!R.empty() && "implicitly declared allocation functions not found");<br>
+ assert(!R.isAmbiguous() && "global allocation functions are ambiguous");<br>
+<br>
+ // We do our own custom access checks below.<br>
+ R.suppressDiagnostics();<br>
+<br>
+ SmallVector<Expr *, 8> Args(TheCall->arg_begin(), TheCall->arg_end());<br>
+ OverloadCandidateSet Candidates(R.getNameLoc(),<br>
+ OverloadCandidateSet::CSK_<wbr>Normal);<br>
+ for (LookupResult::iterator FnOvl = R.begin(), FnOvlEnd = R.end();<br>
+ FnOvl != FnOvlEnd; ++FnOvl) {<br>
+ // Even member operator new/delete are implicitly treated as<br>
+ // static, so don't use AddMemberCandidate.<br>
+ NamedDecl *D = (*FnOvl)->getUnderlyingDecl();<br>
+<br>
+ if (FunctionTemplateDecl *FnTemplate = dyn_cast<FunctionTemplateDecl><wbr>(D)) {<br>
+ S.<wbr>AddTemplateOverloadCandidate(<wbr>FnTemplate, FnOvl.getPair(),<br>
+ /*ExplicitTemplateArgs=*/<wbr>nullptr, Args,<br>
+ Candidates,<br>
+ /*SuppressUserConversions=*/<wbr>false);<br>
+ continue;<br>
+ }<br>
+<br>
+ FunctionDecl *Fn = cast<FunctionDecl>(D);<br>
+ S.AddOverloadCandidate(Fn, FnOvl.getPair(), Args, Candidates,<br>
+ /*SuppressUserConversions=*/<wbr>false);<br>
+ }<br>
+<br>
+ SourceRange Range = TheCall->getSourceRange();<br>
+<br>
+ // Do the resolution.<br>
+ OverloadCandidateSet::iterator Best;<br>
+ switch (Candidates.<wbr>BestViableFunction(S, R.getNameLoc(), Best)) {<br>
+ case OR_Success: {<br>
+ // Got one!<br>
+ FunctionDecl *FnDecl = Best->Function;<br>
+ assert(R.getNamingClass() == nullptr &&<br>
+ "class members should not be considered");<br>
+<br>
+ if (!FnDecl-><wbr>isReplaceableGlobalAllocationF<wbr>unction()) {<br>
+ S.Diag(R.getNameLoc(), diag::err_builtin_operator_<wbr>new_delete_not_usual)<br>
+ << (IsDelete ? 1 : 0) << Range;<br>
+ S.Diag(FnDecl->getLocation(), diag::note_non_usual_function_<wbr>declared_here)<br>
+ << R.getLookupName() << FnDecl->getSourceRange();<br>
+ return true;<br>
+ }<br>
+<br>
+ Operator = FnDecl;<br>
+ return false;<br>
+ }<br>
+<br>
+ case OR_No_Viable_Function:<br>
+ S.Diag(R.getNameLoc(), diag::err_ovl_no_viable_<wbr>function_in_call)<br>
+ << R.getLookupName() << Range;<br>
+ Candidates.NoteCandidates(S, OCD_AllCandidates, Args);<br>
+ return true;<br>
+<br>
+ case OR_Ambiguous:<br>
+ S.Diag(R.getNameLoc(), diag::err_ovl_ambiguous_call)<br>
+ << R.getLookupName() << Range;<br>
+ Candidates.NoteCandidates(S, OCD_ViableCandidates, Args);<br>
+ return true;<br>
+<br>
+ case OR_Deleted: {<br>
+ S.Diag(R.getNameLoc(), diag::err_ovl_deleted_call)<br>
+ << Best->Function->isDeleted() << R.getLookupName()<br>
+ << S.<wbr>getDeletedOrUnavailableSuffix(<wbr>Best->Function) << Range;<br>
+ Candidates.NoteCandidates(S, OCD_AllCandidates, Args);<br>
+ return true;<br>
+ }<br>
+ }<br>
+ llvm_unreachable("Unreachable, bad result from BestViableFunction");<br>
+}<br>
+<br>
+ExprResult<br>
+Sema::<wbr>SemaBuiltinOperatorNewDeleteOv<wbr>erloaded(ExprResult TheCallResult,<br>
+ bool IsDelete) {<br>
+ CallExpr *TheCall = cast<CallExpr>(TheCallResult.<wbr>get());<br>
+ if (!getLangOpts().CPlusPlus) {<br>
+ Diag(TheCall->getExprLoc(), diag::err_builtin_requires_<wbr>language)<br>
+ << (IsDelete ? "__builtin_operator_delete" : "__builtin_operator_new")<br>
+ << "C++";<br>
+ return ExprError();<br>
+ }<br>
+ // CodeGen assumes it can find the global new and delete to call,<br>
+ // so ensure that they are declared.<br>
+ DeclareGlobalNewDelete();<br>
+<br>
+ FunctionDecl *OperatorNewOrDelete = nullptr;<br>
+ if (<wbr>resolveBuiltinNewDeleteOverloa<wbr>d(*this, TheCall, IsDelete,<br>
+ OperatorNewOrDelete))<br>
+ return ExprError();<br>
+ assert(OperatorNewOrDelete && "should be found");<br>
+<br>
+ TheCall->setType(<wbr>OperatorNewOrDelete-><wbr>getReturnType());<br>
+ for (unsigned i = 0; i != TheCall->getNumArgs(); ++i) {<br>
+ QualType ParamTy = OperatorNewOrDelete-><wbr>getParamDecl(i)->getType();<br>
+ InitializedEntity Entity =<br>
+ InitializedEntity::<wbr>InitializeParameter(Context, ParamTy, false);<br>
+ ExprResult Arg = PerformCopyInitialization(<br>
+ Entity, TheCall->getArg(i)-><wbr>getLocStart(), TheCall->getArg(i));<br>
+ if (Arg.isInvalid())<br>
+ return ExprError();<br>
+ TheCall->setArg(i, Arg.get());<br>
+ }<br>
+ auto Callee = dyn_cast<ImplicitCastExpr>(<wbr>TheCall->getCallee());<br>
+ assert(Callee && Callee->getCastKind() == CK_BuiltinFnToFnPtr &&<br>
+ "Callee expected to be implicit cast to a builtin function pointer");<br>
+ Callee->setType(<wbr>OperatorNewOrDelete->getType()<wbr>);<br>
+<br>
+ return TheCallResult;<br>
+}<br>
+<br>
void Sema::CheckVirtualDtorCall(<wbr>CXXDestructorDecl *dtor, SourceLocation Loc,<br>
bool IsDelete, bool CallCanBeVirtual,<br>
bool WarnOnNonAbstractTypes,<br>
<br>
Added: cfe/trunk/test/CodeGenCXX/<wbr>builtin-operator-new-delete.<wbr>cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/builtin-operator-new-delete.cpp?rev=328134&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/<wbr>CodeGenCXX/builtin-operator-<wbr>new-delete.cpp?rev=328134&<wbr>view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/CodeGenCXX/<wbr>builtin-operator-new-delete.<wbr>cpp (added)<br>
+++ cfe/trunk/test/CodeGenCXX/<wbr>builtin-operator-new-delete.<wbr>cpp Wed Mar 21 12:19:48 2018<br>
@@ -0,0 +1,71 @@<br>
+// RUN: %clang_cc1 -triple x86_64-unknown-unknown %s \<br>
+// RUN: -faligned-allocation -fsized-deallocation -emit-llvm -o - \<br>
+// RUN: | FileCheck %s<br>
+<br>
+typedef __SIZE_TYPE__ size_t;<br>
+<br>
+// Declare an 'operator new' template to tickle a bug in __builtin_operator_new.<br>
+template<typename T> void *operator new(size_t, int (*)(T));<br>
+<br>
+// Ensure that this declaration doesn't cause operator new to lose its<br>
+// 'noalias' attribute.<br>
+void *operator new(size_t);<br>
+<br>
+namespace std {<br>
+ struct nothrow_t {};<br>
+ enum class align_val_t : size_t { __zero = 0,<br>
+ __max = (size_t)-1 };<br>
+}<br>
+std::nothrow_t nothrow;<br>
+<br>
+// Declare the reserved placement operators.<br>
+void *operator new(size_t, void*) throw();<br>
+void operator delete(void*, void*) throw();<br>
+void *operator new[](size_t, void*) throw();<br>
+void operator delete[](void*, void*) throw();<br>
+<br>
+// Declare the replaceable global allocation operators.<br>
+void *operator new(size_t, const std::nothrow_t &) throw();<br>
+void *operator new[](size_t, const std::nothrow_t &) throw();<br>
+void operator delete(void *, const std::nothrow_t &) throw();<br>
+void operator delete[](void *, const std::nothrow_t &) throw();<br>
+<br>
+// Declare some other placement operators.<br>
+void *operator new(size_t, void*, bool) throw();<br>
+void *operator new[](size_t, void*, bool) throw();<br>
+<br>
+<br>
+// CHECK-LABEL: define void @test_basic(<br>
+extern "C" void test_basic() {<br>
+ // CHECK: call i8* @_Znwm(i64 4) [[ATTR_BUILTIN_NEW:#[^ ]*]]<br>
+ // CHECK: call void @_ZdlPv({{.*}}) [[ATTR_BUILTIN_DELETE:#[^ ]*]]<br>
+ // CHECK: ret void<br>
+ __builtin_operator_delete(__<wbr>builtin_operator_new(4));<br>
+}<br>
+// CHECK: declare noalias i8* @_Znwm(i64) [[ATTR_NOBUILTIN:#[^ ]*]]<br>
+// CHECK: declare void @_ZdlPv(i8*) [[ATTR_NOBUILTIN_NOUNWIND:#[^ ]*]]<br>
+<br>
+// CHECK-LABEL: define void @test_aligned_alloc(<br>
+extern "C" void test_aligned_alloc() {<br>
+ // CHECK: call i8* @_ZnwmSt11align_val_t(i64 4, i64 4) [[ATTR_BUILTIN_NEW:#[^ ]*]]<br>
+ // CHECK: call void @_ZdlPvSt11align_val_t({{.*}}, i64 4) [[ATTR_BUILTIN_DELETE:#[^ ]*]]<br>
+ __builtin_operator_delete(__<wbr>builtin_operator_new(4, std::align_val_t(4)), std::align_val_t(4));<br>
+}<br>
+// CHECK: declare noalias i8* @_ZnwmSt11align_val_t(i64, i64) [[ATTR_NOBUILTIN:#[^ ]*]]<br>
+// CHECK: declare void @_ZdlPvSt11align_val_t(i8*, i64) [[ATTR_NOBUILTIN_NOUNWIND:#[^ ]*]]<br>
+<br>
+<br>
+// CHECK-LABEL: define void @test_sized_delete(<br>
+extern "C" void test_sized_delete() {<br>
+ // CHECK: call i8* @_Znwm(i64 4) [[ATTR_BUILTIN_NEW:#[^ ]*]]<br>
+ // CHECK: call void @_ZdlPvm({{.*}}, i64 4) [[ATTR_BUILTIN_DELETE:#[^ ]*]]<br>
+ __builtin_operator_delete(__<wbr>builtin_operator_new(4), 4);<br>
+}<br>
+// CHECK: declare void @_ZdlPvm(i8*, i64) [[ATTR_NOBUILTIN_UNWIND:#[^ ]*]]<br>
+<br>
+<br>
+// CHECK-DAG: attributes [[ATTR_NOBUILTIN]] = {{[{].*}} nobuiltin {{.*[}]}}<br>
+// CHECK-DAG: attributes [[ATTR_NOBUILTIN_NOUNWIND]] = {{[{].*}} nobuiltin nounwind {{.*[}]}}<br>
+<br>
+// CHECK-DAG: attributes [[ATTR_BUILTIN_NEW]] = {{[{].*}} builtin {{.*[}]}}<br>
+// CHECK-DAG: attributes [[ATTR_BUILTIN_DELETE]] = {{[{].*}} builtin {{.*[}]}}<br>
<br>
Added: cfe/trunk/test/SemaCXX/<wbr>builtin-operator-new-delete.<wbr>cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/builtin-operator-new-delete.cpp?rev=328134&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/<wbr>SemaCXX/builtin-operator-new-<wbr>delete.cpp?rev=328134&view=<wbr>auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/SemaCXX/<wbr>builtin-operator-new-delete.<wbr>cpp (added)<br>
+++ cfe/trunk/test/SemaCXX/<wbr>builtin-operator-new-delete.<wbr>cpp Wed Mar 21 12:19:48 2018<br>
@@ -0,0 +1,153 @@<br>
+// RUN: %clang_cc1 -std=c++1z -fsyntax-only -verify %s<br>
+// RUN: %clang_cc1 -std=c++03 -fsyntax-only -verify %s<br>
+// RUN: %clang_cc1 -std=c++03 -faligned-allocation -fsyntax-only -verify %s<br>
+// RUN: %clang_cc1 -std=c++11 -fsyntax-only -verify %s<br>
+// RUN: %clang_cc1 -std=c++11 -fsyntax-only -verify -fsized-deallocation %s<br>
+<br>
+#if !__has_builtin(__builtin_<wbr>operator_new) || !__has_builtin(__builtin_<wbr>operator_delete)<br>
+#error builtins should always be available<br>
+#endif<br>
+<br>
+#if __has_builtin(__builtin_<wbr>operator_new) != 201802L || \<br>
+ __has_builtin(__builtin_<wbr>operator_delete) != 201802L<br>
+#error builtin should report updated value<br>
+#endif<br>
+<br>
+typedef __SIZE_TYPE__ size_t;<br>
+namespace std {<br>
+ struct nothrow_t {};<br>
+#if __cplusplus >= 201103L<br>
+enum class align_val_t : size_t {};<br>
+#else<br>
+ enum align_val_t { __zero = 0,<br>
+ __max = (size_t)-1 };<br>
+#endif<br>
+}<br>
+std::nothrow_t nothrow;<br>
+<br>
+void *operator new(size_t); // expected-note 1+ {{candidate function}}<br>
+void operator delete(void *); // expected-note 1+ {{candidate function}}<br>
+<br>
+// Declare the reserved placement operators.<br>
+void *operator new(size_t, void*) throw(); // expected-note 1+ {{candidate function}}<br>
+void operator delete(void *, void *)throw(); // expected-note 1+ {{candidate function}}<br>
+void *operator new[](size_t, void*) throw();<br>
+void operator delete[](void*, void*) throw();<br>
+<br>
+// Declare the replaceable global allocation operators.<br>
+void *operator new(size_t, const std::nothrow_t &) throw(); // expected-note 1+ {{candidate function}}<br>
+void *operator new[](size_t, const std::nothrow_t &) throw();<br>
+void operator delete(void *, const std::nothrow_t &)throw(); // expected-note 1+ {{candidate function}}<br>
+void operator delete[](void *, const std::nothrow_t &) throw();<br>
+<br>
+// aligned allocation and deallocation functions.<br>
+void* operator new ( size_t count, std::align_val_t al); // expected-note 1+ {{candidate function}}<br>
+void operator delete(void *, std::align_val_t); // expected-note 1+ {{candidate}}<br>
+#ifndef __cpp_aligned_new<br>
+// expected-note@-3 1+ {{non-usual 'operator new' declared here}}<br>
+// expected-note@-3 1+ {{non-usual 'operator delete' declared here}}<br>
+#endif<br>
+void *operator new[](size_t count, std::align_val_t al);<br>
+void operator delete[](void*, std::align_val_t);<br>
+<br>
+void operator delete(void *, size_t); // expected-note 1+ {{candidate}}<br>
+#ifndef __cpp_sized_deallocation<br>
+// expected-note@-2 1+ {{non-usual 'operator delete' declared here}}<br>
+#endif<br>
+void operator delete[](void*, size_t);<br>
+<br>
+// Declare some other placemenet operators.<br>
+void *operator new(size_t, void*, bool) throw(); // expected-note 1+ {{candidate function}}<br>
+void *operator new[](size_t, void*, bool) throw();<br>
+<br>
+void *NP = 0;<br>
+<br>
+void test_typo_in_args() {<br>
+ __builtin_operator_new(DNE); // expected-error {{undeclared identifier 'DNE'}}<br>
+ __builtin_operator_new(DNE, DNE2); // expected-error {{undeclared identifier 'DNE'}} expected-error {{'DNE2'}}<br>
+ __builtin_operator_delete(DNE)<wbr>; // expected-error {{'DNE'}}<br>
+ __builtin_operator_delete(DNE, DNE2); // expected-error {{'DNE'}} expected-error {{'DNE2'}}<br>
+}<br>
+<br>
+void test_arg_types() {<br>
+ __builtin_operator_new(NP); // expected-error {{no matching function for call to 'operator new'}}<br>
+ __builtin_operator_new(NP, std::align_val_t(0)); // expected-error {{no matching function for call to 'operator new'}}}<br>
+}<br>
+void test_return_type() {<br>
+ int w = __builtin_operator_new(42); // expected-error {{cannot initialize a variable of type 'int' with an rvalue of type 'void *'}}<br>
+ int y = __builtin_operator_delete(NP); // expected-error {{cannot initialize a variable of type 'int' with an rvalue of type 'void'}}<br>
+}<br>
+<br>
+void test_aligned_new() {<br>
+#ifdef __cpp_aligned_new<br>
+ void *p = __builtin_operator_new(42, std::align_val_t(2));<br>
+ __builtin_operator_delete(p, std::align_val_t(2));<br>
+#else<br>
+ // FIXME: We've manually declared the aligned new/delete overloads,<br>
+ // but LangOpts::AlignedAllocation is false. Should our overloads be considered<br>
+ // usual allocation/deallocation functions?<br>
+ void *p = __builtin_operator_new(42, std::align_val_t(2)); // expected-error {{call to '__builtin_operator_new' selects non-usual allocation function}}<br>
+ __builtin_operator_delete(p, std::align_val_t(2)); // expected-error {{call to '__builtin_operator_delete' selects non-usual deallocation function}}<br>
+#endif<br>
+}<br>
+<br>
+void test_sized_delete() {<br>
+#ifdef __cpp_sized_deallocation<br>
+ __builtin_operator_delete(NP, 4);<br>
+#else<br>
+ __builtin_operator_delete(NP, 4); // expected-error {{call to '__builtin_operator_delete' selects non-usual deallocation function}}<br>
+#endif<br>
+}<br>
+<br>
+void *operator new(size_t, bool); // expected-note 1+ {{candidate}}<br>
+// expected-note@-1 {{non-usual 'operator new' declared here}}<br>
+void operator delete(void *, bool); // expected-note 1+ {{candidate}}<br>
+// expected-note@-1 {{non-usual 'operator delete' declared here}}<br>
+<br>
+void test_non_usual() {<br>
+ __builtin_operator_new(42, true); // expected-error {{call to '__builtin_operator_new' selects non-usual allocation function}}<br>
+ __builtin_operator_delete(NP, false); // expected-error {{call to '__builtin_operator_delete' selects non-usual deallocation function}}<br>
+}<br>
+<br>
+template <int ID><br>
+struct Tag {};<br>
+struct ConvertsToTypes {<br>
+ operator std::align_val_t() const;<br>
+ operator Tag<0>() const;<br>
+};<br>
+<br>
+void *operator new(size_t, Tag<0>); // expected-note 0+ {{candidate}}<br>
+void operator delete(void *, Tag<0>); // expected-note 0+ {{candidate}}<br>
+<br>
+void test_ambiguous() {<br>
+#ifdef __cpp_aligned_new<br>
+ ConvertsToTypes cvt;<br>
+ __builtin_operator_new(42, cvt); // expected-error {{call to 'operator new' is ambiguous}}<br>
+ __builtin_operator_delete(NP, cvt); // expected-error {{call to 'operator delete' is ambiguous}}<br>
+#endif<br>
+}<br>
+<br>
+void test_no_args() {<br>
+ __builtin_operator_new(); // expected-error {{no matching function for call to 'operator new'}}<br>
+ __builtin_operator_delete(); // expected-error {{no matching function for call to 'operator delete'}}<br>
+}<br>
+<br>
+void test_no_matching_fn() {<br>
+ Tag<1> tag;<br>
+ __builtin_operator_new(42, tag); // expected-error {{no matching function for call to 'operator new'}}<br>
+ __builtin_operator_delete(NP, tag); // expected-error {{no matching function for call to 'operator delete'}}<br>
+}<br>
+<br>
+template <class Tp, class Up, class RetT><br>
+void test_dependent_call(Tp new_arg, Up delete_arg, RetT) {<br>
+ RetT ret = __builtin_operator_new(new_<wbr>arg);<br>
+ __builtin_operator_delete(<wbr>delete_arg);<br>
+}<br>
+template void test_dependent_call(int, int*, void*);<br>
+<br>
+void test_const_attribute() {<br>
+ __builtin_operator_new(42); // expected-warning {{ignoring return value of function declared with const attribute}}<br>
+#ifdef __cpp_aligned_new<br>
+ __builtin_operator_new(42, std::align_val_t(8)); // expected-warning {{ignoring return value of function declared with const attribute}}<br>
+#endif<br>
+}<br>
<br>
<br>
______________________________<wbr>_________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>