Deduplicate ref-counted implementations

Author: vogelsgesang

libcxx/src/exception.cpp

@@ -24,12 +24,15 @@ using namespace __cxxabiv1;
 #  include "support/runtime/exception_pointer_msvc.ipp"
 #elif defined(_LIBCPPABI_VERSION)
 #  include "support/runtime/exception_libcxxabi.ipp"
+#  include "support/runtime/exception_pointer_refcounted.ipp"
 #  include "support/runtime/exception_pointer_cxxabi.ipp"
 #elif defined(LIBCXXRT)
 #  include "support/runtime/exception_libcxxrt.ipp"
+#  include "support/runtime/exception_pointer_refcounted.ipp"
 #  include "support/runtime/exception_pointer_cxxabi.ipp"
 #elif defined(__GLIBCXX__)
 #  include "support/runtime/exception_glibcxx.ipp"
+#  include "support/runtime/exception_pointer_refcounted.ipp"
 #  include "support/runtime/exception_pointer_glibcxx.ipp"
 #else
 #  include "include/atomic_support.h"

libcxx/src/support/runtime/exception_pointer_cxxabi.ipp

@@ -21,29 +21,6 @@ void exception_ptr::__decrement_refcount([[__gnu__::__nonnull__]] _LIBCPP_NOESCA
   __cxa_decrement_exception_refcount(__ptr);
 }
 
-exception_ptr exception_ptr::__from_native_exception_pointer(void* __e) noexcept {
-  exception_ptr ptr;
-  ptr.__ptr_ = __e;
-  __cxa_increment_exception_refcount(ptr.__ptr_);
-
-  return ptr;
-}
-
-exception_ptr::~exception_ptr() noexcept { __decrement_refcount(__ptr_); }
-
-exception_ptr::exception_ptr(const exception_ptr& other) noexcept : __ptr_(other.__ptr_) {
-  __increment_refcount(__ptr_);
-}
-
-exception_ptr& exception_ptr::operator=(const exception_ptr& other) noexcept {
-  if (__ptr_ != other.__ptr_) {
-    __increment_refcount(other.__ptr_);
-    __decrement_refcount(__ptr_);
-    __ptr_ = other.__ptr_;
-  }
-  return *this;
-}
-
 nested_exception::nested_exception() noexcept : __ptr_(current_exception()) {}
 
 nested_exception::~nested_exception() noexcept {}

libcxx/src/support/runtime/exception_pointer_glibcxx.ipp

@@ -38,28 +38,6 @@ void exception_ptr::__decrement_refcount([[__gnu__::__nonnull__]] _LIBCPP_NOESCA
   reinterpret_cast<__exception_ptr::exception_ptr*>(this)->_M_release();
 }
 
-exception_ptr exception_ptr::__from_native_exception_pointer(void* __e) noexcept {
-  exception_ptr ptr{};
-  new (reinterpret_cast<void*>(&ptr)) __exception_ptr::exception_ptr(__e);
-
-  return ptr;
-}
-
-exception_ptr::~exception_ptr() noexcept { __decrement_refcount(__ptr_); }
-
-exception_ptr::exception_ptr(const exception_ptr& other) noexcept : __ptr_(other.__ptr_) {
-  __increment_refcount(__ptr_);
-}
-
-exception_ptr& exception_ptr::operator=(const exception_ptr& other) noexcept {
-  if (__ptr_ != other.__ptr_) {
-    __increment_refcount(other.__ptr_);
-    __decrement_refcount(__ptr_);
-    __ptr_ = other.__ptr_;
-  }
-  return *this;
-}
-
 nested_exception::nested_exception() noexcept : __ptr_(current_exception()) {}
 
 [[noreturn]] void nested_exception::rethrow_nested() const {

libcxx/src/support/runtime/exception_pointer_refcounted.ipp

@@ -0,0 +1,37 @@
+// -*- C++ -*-
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// Provides the common functionality shared between cxxabi and glibcxx.
+
+namespace std {
+
+exception_ptr exception_ptr::__from_native_exception_pointer(void* __e) noexcept {
+  exception_ptr ptr;
+  ptr.__ptr_ = __e;
+  __increment_refcount(ptr.__ptr_);
+
+  return ptr;
+}
+
+exception_ptr::~exception_ptr() noexcept { __decrement_refcount(__ptr_); }
+
+exception_ptr::exception_ptr(const exception_ptr& other) noexcept : __ptr_(other.__ptr_) {
+  __increment_refcount(__ptr_);
+}
+
+exception_ptr& exception_ptr::operator=(const exception_ptr& other) noexcept {
+  if (__ptr_ != other.__ptr_) {
+    __increment_refcount(other.__ptr_);
+    __decrement_refcount(__ptr_);
+    __ptr_ = other.__ptr_;
+  }
+  return *this;
+}
+
+} // namespace std

libcxx/src/support/runtime/exception_pointer_unimplemented.ipp

@@ -21,22 +21,6 @@ void exception_ptr::__decrement_refcount([[__gnu__::__nonnull__]] _LIBCPP_NOESCA
   __libcpp_verbose_abort("exception_ptr not yet implemented\n");
 }
 
-exception_ptr exception_ptr::__from_native_exception_pointer(void *__e) noexcept {
-  __libcpp_verbose_abort("exception_ptr not yet implemented\n");
-}
-
-exception_ptr::~exception_ptr() noexcept {
-  __libcpp_verbose_abort("exception_ptr not yet implemented\n");
-}
-
-exception_ptr::exception_ptr(const exception_ptr& other) noexcept : __ptr_(other.__ptr_) {
-  __libcpp_verbose_abort("exception_ptr not yet implemented\n");
-}
-
-exception_ptr& exception_ptr::operator=(const exception_ptr& other) noexcept {
-  __libcpp_verbose_abort("exception_ptr not yet implemented\n");
-}
-
 nested_exception::nested_exception() noexcept : __ptr_(current_exception()) {}
 
 #if !defined(__GLIBCXX__)