ibc++abi: mark visibility

Mark functions and types with the appropriate visibility.  This is particularly
useful for environments which explicitly indicate origin of functions (Windows).
This aids in generating libc++abi as a DSO which exposes only the public
interfaces.

git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@254691 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 120 insertions, 73 deletions

diff --git a/include/__cxxabi_config.h b/include/__cxxabi_config.h
index 957754f..68e325f 100644
--- a/include/__cxxabi_config.h
+++ b/include/__cxxabi_config.h
@@ -17,4 +17,28 @@
 #define LIBCXXABI_ARM_EHABI 0
 #endif
 
+#if !defined(__has_attribute)
+#define __has_attribute(_attribute_) 0
+#endif
+
+#if defined(_LIBCXXABI_DLL)
+ #if defined(cxxabi_EXPORTS)
+  #define _LIBCXXABI_HIDDEN
+  #define _LIBCXXABI_FUNC_VIS __declspec(dllexport)
+  #define _LIBCXXABI_TYPE_VIS __declspec(dllexport)
+ #else
+  #define _LIBCXXABI_HIDDEN
+  #define _LIBCXXABI_FUNC_VIS __declspec(dllimport)
+  #define _LIBCXXABI_TYPE_VIS __declspec(dllimport)
+ #endif
+#else
+ #define _LIBCXXABI_HIDDEN __attribute__((__visibility__("hidden")))
+ #define _LIBCXXABI_FUNC_VIS __attribute__((__visibility__("default")))
+ #if __has_attribute(__type_visibility__)
+  #define _LIBCXXABI_TYPE_VIS __attribute__((__type_visibility__("default")))
+ #else
+  #define _LIBCXXABI_TYPE_VIS __attribute__((__visibility__("default")))
+ #endif
+#endif
+
 #endif // ____CXXABI_CONFIG_H
diff --git a/include/cxxabi.h b/include/cxxabi.h
index 253a3df..e4a6797 100644
--- a/include/cxxabi.h
+++ b/include/cxxabi.h
@@ -26,7 +26,11 @@
 #ifdef __cplusplus
 
 namespace std {
+#if defined(_WIN32)
+class _LIBCXXABI_TYPE_VIS type_info; // forward declaration
+#else
 class type_info; // forward declaration
+#endif
 }
 
 
@@ -35,113 +39,132 @@ namespace __cxxabiv1 {
 extern "C"  {
 
 // 2.4.2 Allocating the Exception Object
-extern void *__cxa_allocate_exception(size_t thrown_size) throw();
-extern void __cxa_free_exception(void *thrown_exception) throw();
+extern _LIBCXXABI_FUNC_VIS void *
+__cxa_allocate_exception(size_t thrown_size) throw();
+extern _LIBCXXABI_FUNC_VIS void
+__cxa_free_exception(void *thrown_exception) throw();
 
 // 2.4.3 Throwing the Exception Object
-extern LIBCXXABI_NORETURN void __cxa_throw(void *thrown_exception,
-                                           std::type_info *tinfo,
-                                           void (*dest)(void *));
+extern _LIBCXXABI_FUNC_VIS LIBCXXABI_NORETURN void
+__cxa_throw(void *thrown_exception, std::type_info *tinfo,
+            void (*dest)(void *));
 
 // 2.5.3 Exception Handlers
-extern void *__cxa_get_exception_ptr(void *exceptionObject) throw();
-extern void *__cxa_begin_catch(void *exceptionObject) throw();
-extern void __cxa_end_catch();
+extern _LIBCXXABI_FUNC_VIS void *
+__cxa_get_exception_ptr(void *exceptionObject) throw();
+extern _LIBCXXABI_FUNC_VIS void *
+__cxa_begin_catch(void *exceptionObject) throw();
+extern _LIBCXXABI_FUNC_VIS void __cxa_end_catch();
 #if LIBCXXABI_ARM_EHABI
-extern bool __cxa_begin_cleanup(void *exceptionObject) throw();
-extern void __cxa_end_cleanup();
+extern _LIBCXXABI_FUNC_VIS bool
+__cxa_begin_cleanup(void *exceptionObject) throw();
+extern _LIBCXXABI_FUNC_VIS void __cxa_end_cleanup();
 #endif
-extern std::type_info *__cxa_current_exception_type();
+extern _LIBCXXABI_FUNC_VIS std::type_info *__cxa_current_exception_type();
 
 // 2.5.4 Rethrowing Exceptions
-extern LIBCXXABI_NORETURN void __cxa_rethrow();
+extern _LIBCXXABI_FUNC_VIS LIBCXXABI_NORETURN void __cxa_rethrow();
 
 // 2.6 Auxiliary Runtime APIs
-extern LIBCXXABI_NORETURN void __cxa_bad_cast(void);
-extern LIBCXXABI_NORETURN void __cxa_bad_typeid(void);
-extern LIBCXXABI_NORETURN void __cxa_throw_bad_array_new_length(void);
+extern _LIBCXXABI_FUNC_VIS LIBCXXABI_NORETURN void __cxa_bad_cast(void);
+extern _LIBCXXABI_FUNC_VIS LIBCXXABI_NORETURN void __cxa_bad_typeid(void);
+extern _LIBCXXABI_FUNC_VIS LIBCXXABI_NORETURN void
+__cxa_throw_bad_array_new_length(void);
 
 // 3.2.6 Pure Virtual Function API
-extern LIBCXXABI_NORETURN void __cxa_pure_virtual(void);
+extern _LIBCXXABI_FUNC_VIS LIBCXXABI_NORETURN void __cxa_pure_virtual(void);
 
 // 3.2.7 Deleted Virtual Function API
-extern LIBCXXABI_NORETURN void __cxa_deleted_virtual(void);
+extern _LIBCXXABI_FUNC_VIS LIBCXXABI_NORETURN void __cxa_deleted_virtual(void);
 
 // 3.3.2 One-time Construction API
 #ifdef __arm__
-extern int __cxa_guard_acquire(uint32_t *);
-extern void __cxa_guard_release(uint32_t *);
-extern void __cxa_guard_abort(uint32_t *);
+extern _LIBCXXABI_FUNC_VIS int __cxa_guard_acquire(uint32_t *);
+extern _LIBCXXABI_FUNC_VIS void __cxa_guard_release(uint32_t *);
+extern _LIBCXXABI_FUNC_VIS void __cxa_guard_abort(uint32_t *);
 #else
-extern int __cxa_guard_acquire(uint64_t *);
-extern void __cxa_guard_release(uint64_t *);
-extern void __cxa_guard_abort(uint64_t *);
+extern _LIBCXXABI_FUNC_VIS int __cxa_guard_acquire(uint64_t *);
+extern _LIBCXXABI_FUNC_VIS void __cxa_guard_release(uint64_t *);
+extern _LIBCXXABI_FUNC_VIS void __cxa_guard_abort(uint64_t *);
 #endif
 
 // 3.3.3 Array Construction and Destruction API
-extern void *__cxa_vec_new(size_t element_count, size_t element_size,
-                           size_t padding_size, void (*constructor)(void *),
-                           void (*destructor)(void *));
-
-extern void *__cxa_vec_new2(size_t element_count, size_t element_size,
-                            size_t padding_size, void (*constructor)(void *),
-                            void (*destructor)(void *), void *(*alloc)(size_t),
-                            void (*dealloc)(void *));
-
-extern void *__cxa_vec_new3(size_t element_count, size_t element_size,
-                            size_t padding_size, void (*constructor)(void *),
-                            void (*destructor)(void *), void *(*alloc)(size_t),
-                            void (*dealloc)(void *, size_t));
-
-extern void __cxa_vec_ctor(void *array_address, size_t element_count,
-                           size_t element_size, void (*constructor)(void *),
-                           void (*destructor)(void *));
-
-extern void __cxa_vec_dtor(void *array_address, size_t element_count,
-                           size_t element_size, void (*destructor)(void *));
-
-extern void __cxa_vec_cleanup(void *array_address, size_t element_count,
-                              size_t element_size, void (*destructor)(void *));
-
-extern void __cxa_vec_delete(void *array_address, size_t element_size,
-                             size_t padding_size, void (*destructor)(void *));
-
-extern void __cxa_vec_delete2(void *array_address, size_t element_size,
-                              size_t padding_size, void (*destructor)(void *),
-                              void (*dealloc)(void *));
-
-extern void __cxa_vec_delete3(void *__array_address, size_t element_size,
-                              size_t padding_size, void (*destructor)(void *),
-                              void (*dealloc)(void *, size_t));
-
-extern void __cxa_vec_cctor(void *dest_array, void *src_array,
-                            size_t element_count, size_t element_size,
-                            void (*constructor)(void *, void *),
-                            void (*destructor)(void *));
+extern _LIBCXXABI_FUNC_VIS void *
+__cxa_vec_new(size_t element_count, size_t element_size, size_t padding_size,
+              void (*constructor)(void *), void (*destructor)(void *));
+
+extern _LIBCXXABI_FUNC_VIS void *
+__cxa_vec_new2(size_t element_count, size_t element_size, size_t padding_size,
+               void (*constructor)(void *), void (*destructor)(void *),
+               void *(*alloc)(size_t), void (*dealloc)(void *));
+
+extern _LIBCXXABI_FUNC_VIS void *
+__cxa_vec_new3(size_t element_count, size_t element_size, size_t padding_size,
+               void (*constructor)(void *), void (*destructor)(void *),
+               void *(*alloc)(size_t), void (*dealloc)(void *, size_t));
+
+extern _LIBCXXABI_FUNC_VIS void
+__cxa_vec_ctor(void *array_address, size_t element_count, size_t element_size,
+               void (*constructor)(void *), void (*destructor)(void *));
+
+extern _LIBCXXABI_FUNC_VIS void __cxa_vec_dtor(void *array_address,
+                                               size_t element_count,
+                                               size_t element_size,
+                                               void (*destructor)(void *));
+
+extern _LIBCXXABI_FUNC_VIS void __cxa_vec_cleanup(void *array_address,
+                                                  size_t element_count,
+                                                  size_t element_size,
+                                                  void (*destructor)(void *));
+
+extern _LIBCXXABI_FUNC_VIS void __cxa_vec_delete(void *array_address,
+                                                 size_t element_size,
+                                                 size_t padding_size,
+                                                 void (*destructor)(void *));
+
+extern _LIBCXXABI_FUNC_VIS void
+__cxa_vec_delete2(void *array_address, size_t element_size, size_t padding_size,
+                  void (*destructor)(void *), void (*dealloc)(void *));
+
+extern _LIBCXXABI_FUNC_VIS void
+__cxa_vec_delete3(void *__array_address, size_t element_size,
+                  size_t padding_size, void (*destructor)(void *),
+                  void (*dealloc)(void *, size_t));
+
+extern _LIBCXXABI_FUNC_VIS void
+__cxa_vec_cctor(void *dest_array, void *src_array, size_t element_count,
+                size_t element_size, void (*constructor)(void *, void *),
+                void (*destructor)(void *));
 
 // 3.3.5.3 Runtime API
-extern int __cxa_atexit(void (*f)(void *), void *p, void *d);
-extern int __cxa_finalize(void *);
+extern _LIBCXXABI_FUNC_VIS int __cxa_atexit(void (*f)(void *), void *p,
+                                            void *d);
+extern _LIBCXXABI_FUNC_VIS int __cxa_finalize(void *);
 
 // 3.4 Demangler API
-extern char *__cxa_demangle(const char *mangled_name, char *output_buffer,
-                            size_t *length, int *status);
+extern _LIBCXXABI_FUNC_VIS char *__cxa_demangle(const char *mangled_name,
+                                                char *output_buffer,
+                                                size_t *length, int *status);
 
 // Apple additions to support C++ 0x exception_ptr class
 // These are primitives to wrap a smart pointer around an exception object
-extern void *__cxa_current_primary_exception() throw();
-extern void __cxa_rethrow_primary_exception(void *primary_exception);
-extern void __cxa_increment_exception_refcount(void *primary_exception) throw();
-extern void __cxa_decrement_exception_refcount(void *primary_exception) throw();
+extern _LIBCXXABI_FUNC_VIS void *__cxa_current_primary_exception() throw();
+extern _LIBCXXABI_FUNC_VIS void
+__cxa_rethrow_primary_exception(void *primary_exception);
+extern _LIBCXXABI_FUNC_VIS void
+__cxa_increment_exception_refcount(void *primary_exception) throw();
+extern _LIBCXXABI_FUNC_VIS void
+__cxa_decrement_exception_refcount(void *primary_exception) throw();
 
 // Apple extension to support std::uncaught_exception()
-extern bool __cxa_uncaught_exception() throw();
-extern unsigned int __cxa_uncaught_exceptions() throw();
+extern _LIBCXXABI_FUNC_VIS bool __cxa_uncaught_exception() throw();
+extern _LIBCXXABI_FUNC_VIS unsigned int __cxa_uncaught_exceptions() throw();
 
 #ifdef __linux__
 // Linux TLS support. Not yet an official part of the Itanium ABI.
 // https://sourceware.org/glibc/wiki/Destructor%20support%20for%20thread_local%20variables
-extern int __cxa_thread_atexit(void (*)(void *), void *, void *) throw();
+extern _LIBCXXABI_FUNC_VIS int __cxa_thread_atexit(void (*)(void *), void *,
+                                                   void *) throw();
 #endif
 
 } // extern "C"