From 391fb8662a75b7cc45cad8926888ff6c5685b4ab Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Tue, 18 Oct 2016 07:13:55 +0000 Subject: [PATCH] [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 --- clang/lib/AST/ASTContext.cpp | 3 +++ clang/test/Analysis/cfg.cpp | 2 +- clang/test/CodeGenCXX/cxx1z-noexcept-function-type.cpp | 9 +++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 clang/test/CodeGenCXX/cxx1z-noexcept-function-type.cpp diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp index d2f01c0..318523e 100644 --- a/clang/lib/AST/ASTContext.cpp +++ b/clang/lib/AST/ASTContext.cpp @@ -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); } diff --git a/clang/test/Analysis/cfg.cpp b/clang/test/Analysis/cfg.cpp index f35a1fc..4fa7f1d 100644 --- a/clang/test/Analysis/cfg.cpp +++ b/clang/test/Analysis/cfg.cpp @@ -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 diff --git a/clang/test/CodeGenCXX/cxx1z-noexcept-function-type.cpp b/clang/test/CodeGenCXX/cxx1z-noexcept-function-type.cpp new file mode 100644 index 0000000..d2d06fb --- /dev/null +++ b/clang/test/CodeGenCXX/cxx1z-noexcept-function-type.cpp @@ -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); } -- 2.7.4