Index: libcxx/include/type_traits
===================================================================
--- libcxx/include/type_traits
+++ libcxx/include/type_traits
@@ -65,6 +65,11 @@
     template <class T> struct add_volatile;
     template <class T> struct add_cv;
 
+#ifdef __clang__
+    // Remove address space from type.
+    template <class T> struct __remove_address_space;
+#endif
+
     // Reference transformations:
     template <class T> struct remove_reference;
     template <class T> struct add_lvalue_reference;
@@ -700,6 +705,14 @@
 template <class _Tp> using remove_cv_t = typename remove_cv<_Tp>::type;
 #endif
 
+#ifdef __clang__
+// __remove_address_space
+
+template<class... T> struct __remove_address_space;
+template <class _Tp> struct __remove_address_space<_Tp> { typedef _Tp type; };
+template <class _Tp, int I> struct __remove_address_space<_Tp __attribute__((address_space(I)))> { typedef _Tp __attribute__((address_space(I))) type; };
+#endif
+
 // is_void
 
 template <class _Tp> struct __libcpp_is_void       : public false_type {};
Index: libcxx/test/libcxx/type_traits/address_space.pass.cpp
===================================================================
--- /dev/null
+++ libcxx/test/libcxx/type_traits/address_space.pass.cpp
@@ -0,0 +1,22 @@
+//===----------------------------------------------------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+//
+
+#include <type_traits>
+#ifdef __clang__
+typedef int __attribute__((address_space(2))) intAS2;
+
+void foo(){
+  std::__remove_address_space<intAS2> i;
+  (void)i;
+}
+#endif
+
+int main(int, char**) {
+  return 0;
+}