Generalize r228066 to give all implicit global allocation functions default visibility.

llvm-svn: 228107

4 files changed, 59 insertions, 33 deletions

diff --git a/clang/lib/AST/Decl.cpp b/clang/lib/AST/Decl.cpp
index c66cd5d9525..9988c71d978 100644
--- a/clang/lib/AST/Decl.cpp
+++ b/clang/lib/AST/Decl.cpp
@@ -666,12 +666,7 @@ static LinkageInfo getLVForNamespaceScopeDecl(const NamedDecl *D,
       // Use global type/value visibility as appropriate.
       Visibility globalVisibility;
       if (computation == LVForValue) {
-        const FunctionDecl *FD = D->getAsFunction();
-        if (FD && FD->getCorrespondingUnsizedGlobalDeallocationFunction())
-          // C++14's implicit sized deallocation functions always have default visibility.
-          globalVisibility = DefaultVisibility;
-        else
-          globalVisibility = Context.getLangOpts().getValueVisibilityMode();
+        globalVisibility = Context.getLangOpts().getValueVisibilityMode();
       } else {
         assert(computation == LVForType);
         globalVisibility = Context.getLangOpts().getTypeVisibilityMode();
diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp
index 716e59458ae..c142efb11d5 100644
--- a/clang/lib/Sema/SemaExprCXX.cpp
+++ b/clang/lib/Sema/SemaExprCXX.cpp
@@ -2116,6 +2116,10 @@ void Sema::DeclareGlobalAllocationFunction(DeclarationName Name,
                          SourceLocation(), Name,
                          FnType, /*TInfo=*/nullptr, SC_None, false, true);
   Alloc->setImplicit();
+  
+  // Implicit sized deallocation functions always have default visibility.
+  Alloc->addAttr(VisibilityAttr::CreateImplicit(Context,
+                                                VisibilityAttr::Default));
 
   if (AddMallocAttr)
     Alloc->addAttr(MallocAttr::CreateImplicit(Context));
diff --git a/clang/test/CodeGenCXX/cxx14-implicit-sized-delete.cpp b/clang/test/CodeGenCXX/cxx14-implicit-sized-delete.cpp
deleted file mode 100644
index 8a89fcb5f09..00000000000
--- a/clang/test/CodeGenCXX/cxx14-implicit-sized-delete.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// RUN: %clang_cc1 -emit-llvm -triple x86_64-unknown-unknown -o - -std=c++14 %s 2>&1 | FileCheck %s -check-prefix=CHECKDEF -check-prefix=CHECK
-// RUN: %clang_cc1 -emit-llvm -triple x86_64-unknown-unknown -o - -std=c++14 -fvisibility hidden %s 2>&1 | FileCheck %s -check-prefix=CHECKHID -check-prefix=CHECK
-
-// PR22419: Implicit sized deallocation functions always have default visibility.
-
-// CHECKDEF-DAG: define void @_Z3fooPi(i32* %is)
-// CHECKHID-DAG: define hidden void @_Z3fooPi(i32* %is)
-void foo(int* is) {
-  
-  // CHECK-DAG: call void @_ZdlPvm(i8* %{{.+}}, i64 4)
-  delete is;
-}
-
-// CHECK-DAG: define linkonce void @_ZdlPvm(i8*, i64)
-
-// CHECK-DAG: %struct.A = type { i8 }
-struct A { ~A() { }};
-
-// CHECKDEF-DAG: define void @_Z1fP1A(%struct.A* %p)
-// CHECKHID-DAG: define hidden void @_Z1fP1A(%struct.A* %p)
-void f(A *p) {
-  
-  // CHECK-DAG: call void @_ZdaPvm(i8* %{{.+}}, i64 %{{.+}})
-  delete[] p;
-}
-
-// CHECK-DAG: define linkonce void @_ZdaPvm(i8*, i64)
diff --git a/clang/test/CodeGenCXX/implicit-allocation-functions.cpp b/clang/test/CodeGenCXX/implicit-allocation-functions.cpp
new file mode 100644
index 00000000000..b66b685c9b4
--- /dev/null
+++ b/clang/test/CodeGenCXX/implicit-allocation-functions.cpp
@@ -0,0 +1,54 @@
+// RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple -o - -std=c++11 %s 2>&1 | FileCheck %s -check-prefix=CHECKDEF -check-prefix=CHECK11
+// RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple -o - -std=c++11 -fvisibility hidden %s 2>&1 | FileCheck %s -check-prefix=CHECKHID -check-prefix=CHECK11
+// RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple -o - -std=c++14 %s 2>&1 | FileCheck %s -check-prefix=CHECKDEF -check-prefix=CHECK14
+// RUN: %clang_cc1 -emit-llvm -triple %itanium_abi_triple -o - -std=c++14 -fvisibility hidden %s 2>&1 | FileCheck %s -check-prefix=CHECKHID -check-prefix=CHECK14
+
+// PR22419: Implicit sized deallocation functions always have default visibility.
+//   Generalized to all implicit allocation functions.
+
+
+// CHECK14-DAG: %struct.A = type { i8 }
+struct A { };
+
+// CHECKDEF-DAG: define void @_Z3fooP1A(%struct.A* %is)
+// CHECKHID-DAG: define hidden void @_Z3fooP1A(%struct.A* %is)
+void foo(A* is) {
+
+  // CHECK11-DAG: call noalias i8* @_Znwm(i64 1)
+  // CHECK14-DAG: call noalias i8* @_Znwm(i64 1)
+  is = new A();
+
+  // CHECK11-DAG: call void @_ZdlPv(i8* %{{.+}})
+  // CHECK14-DAG: call void @_ZdlPvm(i8* %{{.+}}, i64 1)
+  delete is;
+}
+
+// CHECK11-DAG: declare noalias i8* @_Znwm(i64)
+// CHECK11-DAG: declare void @_ZdlPv(i8*)
+
+// CHECK14-DAG: declare noalias i8* @_Znwm(i64)
+// CHECK14-DAG: define linkonce void @_ZdlPvm(i8*, i64)
+// CHECK14-DAG: declare void @_ZdlPv(i8*)
+
+// CHECK14-DAG: %struct.B = type { i8 }
+struct B { ~B() { }};
+
+// CHECKDEF-DAG: define void @_Z1fP1B(%struct.B* %p)
+// CHECKHID-DAG: define hidden void @_Z1fP1B(%struct.B* %p)
+void f(B *p) {
+
+  // CHECK11-DAG: call noalias i8* @_Znam(i64 13)
+  // CHECK14-DAG: call noalias i8* @_Znam(i64 13)
+  p = new B[5];
+
+  // CHECK11-DAG: call void @_ZdaPv(i8* %{{.+}})
+  // CHECK14-DAG: call void @_ZdaPvm(i8* %{{.+}}, i64 %{{.+}})
+  delete[] p;
+}
+
+// CHECK11-DAG: declare noalias i8* @_Znam(i64)
+// CHECK11-DAG: declare void @_ZdaPv(i8*)
+
+// CHECK14-DAG: declare noalias i8* @_Znam(i64)
+// CHECK14-DAG: define linkonce void @_ZdaPvm(i8*, i64)
+// CHECK14-DAG: declare void @_ZdaPv(i8*)