[c++1z] Include "noexcept" in builtin function types where appropriate. Fixes

an assertion failure looking up a matching ::operator delete for
__builtin_operator_delete.

llvm-svn: 284458
This commit is contained in:
Richard Smith 2016-10-18 07:13:55 +00:00
parent 99677afd54
commit 391fb8662a
3 changed files with 13 additions and 1 deletions

View File

@ -8671,6 +8671,9 @@ QualType ASTContext::GetBuiltinType(unsigned Id,
FunctionProtoType::ExtProtoInfo EPI;
EPI.ExtInfo = EI;
EPI.Variadic = Variadic;
if (getLangOpts().CPlusPlus && BuiltinInfo.isNoThrow(Id))
EPI.ExceptionSpec.Type =
getLangOpts().CPlusPlus11 ? EST_BasicNoexcept : EST_DynamicNone;
return getFunctionType(ResType, ArgTypes, EPI);
}

View File

@ -92,7 +92,7 @@ void F(EmptyE e) {
// CHECK-NEXT: Succs (1): B1
// CHECK: [B1]
// CHECK-NEXT: 1: __builtin_object_size
// CHECK-NEXT: 2: [B1.1] (ImplicitCastExpr, BuiltinFnToFnPtr, unsigned long (*)(const void *, int))
// CHECK-NEXT: 2: [B1.1] (ImplicitCastExpr, BuiltinFnToFnPtr, unsigned long (*)(const void *, int) noexcept)
// CHECK-NEXT: 3: [B1.2](dummy(), 0)
// CHECK-NEXT: 4: (void)[B1.3] (CStyleCastExpr, ToVoid, void)
// CHECK-NEXT: Preds (1): B2

View File

@ -0,0 +1,9 @@
// RUN: %clang_cc1 -fexceptions -fcxx-exceptions -std=c++1z -emit-llvm %s -o - -triple x86_64-linux-gnu | FileCheck %s
// CHECK-LABEL: define {{.*}} @_Z11builtin_newm(
// CHECK: call {{.*}} @_Znwm(
void *builtin_new(unsigned long n) { return __builtin_operator_new(n); }
// CHECK-LABEL: define {{.*}} @_Z14builtin_deletePv(
// CHECK: call {{.*}} @_ZdlPv(
void builtin_delete(void *p) { return __builtin_operator_delete(p); }