diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/array.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/array.pass.cpp
index db91182ebad5..ef1fc4040dc7 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/array.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/array.pass.cpp
@@ -47,14 +47,15 @@ void test_array()
 typedef char array[3];
 typedef const char const_array[3];
 typedef char incomplete_array[];
-struct incomplete_type;
+struct Incomplete;
 
 int main()
 {
     test_array<array>();
     test_array<const_array>();
     test_array<incomplete_array>();
+    test_array<Incomplete[]>();
 
-//  LWG#2581
-    static_assert(!std::is_array<incomplete_type>::value, "");
+//  LWG#2582
+    static_assert(!std::is_array<Incomplete>::value, "");
 }
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/class.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/class.pass.cpp
index 164e9221cdf5..8c8510882bf6 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/class.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/class.pass.cpp
@@ -53,7 +53,8 @@ struct incomplete_type;
 int main()
 {
     test_class<Class>();
+    test_class<incomplete_type>();
 
-//  LWG#2581
+//  LWG#2582
     static_assert( std::is_class<incomplete_type>::value, "");
 }
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/enum.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/enum.pass.cpp
index 519d4418bab2..40dea443cd41 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/enum.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/enum.pass.cpp
@@ -51,6 +51,6 @@ int main()
 {
     test_enum<Enum>();
 
-//  LWG#2581
+//  LWG#2582
     static_assert(!std::is_enum<incomplete_type>::value, "");
 }
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/floating_point.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/floating_point.pass.cpp
index 207d9e56f8df..217bc7e25659 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/floating_point.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/floating_point.pass.cpp
@@ -52,6 +52,6 @@ int main()
     test_floating_point<double>();
     test_floating_point<long double>();
 
-//  LWG#2581
+//  LWG#2582
     static_assert(!std::is_floating_point<incomplete_type>::value, "");
 }
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/function.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/function.pass.cpp
index e3b079985385..3f21b9a7dbcf 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/function.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/function.pass.cpp
@@ -88,6 +88,6 @@ int main()
     TEST_REF_QUALIFIED( int (double, char, ...) );
 #endif
 
-//  LWG#2581
+//  LWG#2582
     static_assert(!std::is_function<incomplete_type>::value, "");
 }
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/integral.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/integral.pass.cpp
index e9cd36b53a57..a50beeb3e310 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/integral.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/integral.pass.cpp
@@ -66,6 +66,6 @@ int main()
     test_integral<__uint128_t>();
 #endif
 
-//  LWG#2581
+//  LWG#2582
     static_assert(!std::is_integral<incomplete_type>::value, "");
 }
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/is_array.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/is_array.pass.cpp
index fb8df8c3c04c..dfd09ac52bfa 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/is_array.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/is_array.pass.cpp
@@ -90,5 +90,5 @@ int main()
     test_is_not_array<Empty>();
     test_is_not_array<bit_zero>();
     test_is_not_array<NotEmpty>();
-    test_is_not_array<incomplete_type>();  //  LWG#2581
+    test_is_not_array<incomplete_type>();  //  LWG#2582
 }
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/lvalue_ref.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/lvalue_ref.pass.cpp
index 4e7bdbf04c5e..13cad58c0ef3 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/lvalue_ref.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/lvalue_ref.pass.cpp
@@ -41,6 +41,6 @@ int main()
     test_lvalue_ref<int&>();
     test_lvalue_ref<const int&>();
 
-//  LWG#2581
+//  LWG#2582
     static_assert(!std::is_lvalue_reference<incomplete_type>::value, "");
 }
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/member_function_pointer.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/member_function_pointer.pass.cpp
index 49db6ab033fb..a895a8d447b6 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/member_function_pointer.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/member_function_pointer.pass.cpp
@@ -136,6 +136,6 @@ int main()
     test_member_function_pointer<void (Class::*)(int, char,...) const volatile &&>();
 #endif
 
-//  LWG#2581
+//  LWG#2582
     static_assert(!std::is_member_function_pointer<incomplete_type>::value, "");
 }
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/member_function_pointer_no_variadics.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/member_function_pointer_no_variadics.pass.cpp
index 7afc88fbdd02..b0edea37e8e8 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/member_function_pointer_no_variadics.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/member_function_pointer_no_variadics.pass.cpp
@@ -76,6 +76,6 @@ int main()
     test_member_function_pointer<void (Class::*)(int, ...) volatile>();
     test_member_function_pointer<void (Class::*)(int, char, ...) volatile>();
 
-//  LWG#2581
+//  LWG#2582
     static_assert(!std::is_member_function_pointer<incomplete_type>::value, "");
 }
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/member_object_pointer.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/member_object_pointer.pass.cpp
index 4102f9949f34..76deef4291e7 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/member_object_pointer.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/member_object_pointer.pass.cpp
@@ -54,6 +54,6 @@ int main()
 {
     test_member_object_pointer<int Class::*>();
 
-//  LWG#2581
+//  LWG#2582
     static_assert(!std::is_member_object_pointer<incomplete_type>::value, "");
 }
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/nullptr.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/nullptr.pass.cpp
index aad9e3486a88..076204c9c094 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/nullptr.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/nullptr.pass.cpp
@@ -51,7 +51,7 @@ int main()
 {
     test_nullptr<std::nullptr_t>();
 
-//  LWG#2581
+//  LWG#2582
     static_assert(!std::is_null_pointer<incomplete_type>::value, "");
 }
 #else
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/pointer.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/pointer.pass.cpp
index 72c8e36f3c64..f9c83c67d219 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/pointer.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/pointer.pass.cpp
@@ -54,6 +54,6 @@ int main()
     test_pointer<const int*>();
     test_pointer<void (*)(int)>();
 
-//  LWG#2581
+//  LWG#2582
     static_assert(!std::is_pointer<incomplete_type>::value, "");
 }
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/rvalue_ref.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/rvalue_ref.pass.cpp
index 9451a9172d54..99fd2887981f 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/rvalue_ref.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/rvalue_ref.pass.cpp
@@ -43,7 +43,7 @@ int main()
     test_rvalue_ref<int&&>();
     test_rvalue_ref<const int&&>();
 
-//  LWG#2581
+//  LWG#2582
     static_assert(!std::is_rvalue_reference<incomplete_type>::value, "");
 #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
 }
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/union.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/union.pass.cpp
index 5f5732394d4e..36ad00400d35 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/union.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/union.pass.cpp
@@ -56,6 +56,6 @@ int main()
 {
     test_union<Union>();
 
-//  LWG#2581
+//  LWG#2582
     static_assert(!std::is_union<incomplete_type>::value, "");
 }
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/void.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/void.pass.cpp
index f1763667197f..c7597eb4eaf7 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/void.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.cat/void.pass.cpp
@@ -50,6 +50,6 @@ int main()
 {
     test_void<void>();
 
-//  LWG#2581
+//  LWG#2582
     static_assert(!std::is_void<incomplete_type>::value, "");
 }
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/array.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/array.pass.cpp
index 3476d5ceea2b..f601bd12cadb 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/array.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/array.pass.cpp
@@ -38,9 +38,12 @@ typedef char array[3];
 typedef const char const_array[3];
 typedef char incomplete_array[];
 
+class incomplete_type;
+
 int main()
 {
     test_array<array>();
     test_array<const_array>();
     test_array<incomplete_array>();
+    test_array<incomplete_type[]>();
 }
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/class.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/class.pass.cpp
index 49e41380ca27..5fa5da12aef8 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/class.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/class.pass.cpp
@@ -38,7 +38,10 @@ class Class
 {
 };
 
+class incomplete_type;
+
 int main()
 {
     test_class<Class>();
+    test_class<incomplete_type>();
 }
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_arithmetic.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_arithmetic.pass.cpp
index a3f18d52a706..02c539712c65 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_arithmetic.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_arithmetic.pass.cpp
@@ -45,6 +45,8 @@ void test_is_not_arithmetic()
 #endif
 }
 
+class incomplete_type;
+
 class Empty
 {
 };
@@ -98,6 +100,7 @@ int main()
     test_is_not_arithmetic<Enum>();
     test_is_not_arithmetic<FunctionPtr>();
     test_is_not_arithmetic<Empty>();
+    test_is_not_arithmetic<incomplete_type>();
     test_is_not_arithmetic<bit_zero>();
     test_is_not_arithmetic<NotEmpty>();
     test_is_not_arithmetic<Abstract>();
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_compound.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_compound.pass.cpp
index 6a1798ab5adc..d8d5162c1a02 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_compound.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_compound.pass.cpp
@@ -45,6 +45,8 @@ void test_is_not_compound()
 #endif
 }
 
+class incomplete_type;
+
 class Empty
 {
 };
@@ -81,6 +83,7 @@ int main()
     test_is_compound<int&&>();
     test_is_compound<Union>();
     test_is_compound<Empty>();
+    test_is_compound<incomplete_type>();
     test_is_compound<bit_zero>();
     test_is_compound<int*>();
     test_is_compound<const int*>();
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_fundamental.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_fundamental.pass.cpp
index 2c9ce68d24c6..f776196dd7a9 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_fundamental.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_fundamental.pass.cpp
@@ -45,6 +45,8 @@ void test_is_not_fundamental()
 #endif
 }
 
+class incomplete_type;
+
 class Empty
 {
 };
@@ -103,6 +105,7 @@ int main()
     test_is_not_fundamental<int&&>();
     test_is_not_fundamental<Union>();
     test_is_not_fundamental<Empty>();
+    test_is_not_fundamental<incomplete_type>();
     test_is_not_fundamental<bit_zero>();
     test_is_not_fundamental<int*>();
     test_is_not_fundamental<const int*>();
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_member_pointer.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_member_pointer.pass.cpp
index 44b29df01461..c2804885ac50 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_member_pointer.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_member_pointer.pass.cpp
@@ -45,6 +45,8 @@ void test_is_not_member_pointer()
 #endif
 }
 
+class incomplete_type;
+
 class Empty
 {
 };
@@ -93,6 +95,7 @@ int main()
     test_is_not_member_pointer<char[]>();
     test_is_not_member_pointer<Union>();
     test_is_not_member_pointer<Empty>();
+    test_is_not_member_pointer<incomplete_type>();
     test_is_not_member_pointer<bit_zero>();
     test_is_not_member_pointer<NotEmpty>();
     test_is_not_member_pointer<Abstract>();
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_object.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_object.pass.cpp
index 6e93e518a75f..311215b81643 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_object.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_object.pass.cpp
@@ -45,6 +45,8 @@ void test_is_not_object()
 #endif
 }
 
+class incomplete_type;
+
 class Empty
 {
 };
@@ -86,7 +88,7 @@ int main()
     test_is_object<int*>();
     test_is_object<const int*>();
     test_is_object<Enum>();
-    test_is_object<Empty>();
+    test_is_object<incomplete_type>();
     test_is_object<bit_zero>();
     test_is_object<NotEmpty>();
     test_is_object<Abstract>();
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_reference.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_reference.pass.cpp
index e56c8f761814..b546458bdcb8 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_reference.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_reference.pass.cpp
@@ -45,6 +45,8 @@ void test_is_not_reference()
 #endif
 }
 
+class incomplete_type;
+
 class Empty
 {
 };
@@ -87,6 +89,7 @@ int main()
     test_is_not_reference<void *>();
     test_is_not_reference<FunctionPtr>();
     test_is_not_reference<Union>();
+    test_is_not_reference<incomplete_type>();
     test_is_not_reference<Empty>();
     test_is_not_reference<bit_zero>();
     test_is_not_reference<int*>();
diff --git a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_scalar.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_scalar.pass.cpp
index 7cdfc301c815..39ac07ad4bc5 100644
--- a/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_scalar.pass.cpp
+++ b/libcxx/test/std/utilities/meta/meta.unary/meta.unary.comp/is_scalar.pass.cpp
@@ -45,6 +45,8 @@ void test_is_not_scalar()
 #endif
 }
 
+class incomplete_type;
+
 class Empty
 {
 };
@@ -104,6 +106,7 @@ int main()
     test_is_not_scalar<char[]>();
     test_is_not_scalar<Union>();
     test_is_not_scalar<Empty>();
+    test_is_not_scalar<incomplete_type>();
     test_is_not_scalar<bit_zero>();
     test_is_not_scalar<NotEmpty>();
     test_is_not_scalar<Abstract>();
diff --git a/libcxx/www/cxx1z_status.html b/libcxx/www/cxx1z_status.html
index 3dee4637203d..1eae13563af5 100644
--- a/libcxx/www/cxx1z_status.html
+++ b/libcxx/www/cxx1z_status.html
@@ -254,7 +254,7 @@
 	<tr><td><a href="http://wg21.link/LWG2577">2577</a></td><td><tt>{shared,unique}_lock</tt> should use <tt>std::addressof</tt></td><td>Jacksonville</td><td>Complete</td></tr>
 	<tr><td><a href="http://wg21.link/LWG2579">2579</a></td><td>Inconsistency wrt Allocators in <tt>basic_string</tt> assignment vs. <tt>basic_string::assign</tt></td><td>Jacksonville</td><td>Complete</td></tr>
 	<tr><td><a href="http://wg21.link/LWG2581">2581</a></td><td>Specialization of <tt>&lt;type_traits&gt;</tt> variable templates should be prohibited</td><td>Jacksonville</td><td>Complete</td></tr>
-	<tr><td><a href="http://wg21.link/LWG2582">2582</a></td><td>&sect;[res.on.functions]/2's prohibition against incomplete types shouldn't apply to type traits</td><td>Jacksonville</td><td></td></tr>
+	<tr><td><a href="http://wg21.link/LWG2582">2582</a></td><td>&sect;[res.on.functions]/2's prohibition against incomplete types shouldn't apply to type traits</td><td>Jacksonville</td><td>Complete</td></tr>
 	<tr><td><a href="http://wg21.link/LWG2583">2583</a></td><td>There is no way to supply an allocator for <tt>basic_string(str, pos)</tt></td><td>Jacksonville</td><td>Complete</td></tr>
 	<tr><td><a href="http://wg21.link/LWG2585">2585</a></td><td><tt>forward_list::resize(size_type, const value_type&amp;)</tt> effects incorrect</td><td>Jacksonville</td><td>Complete</td></tr>
 	<tr><td><a href="http://wg21.link/LWG2586">2586</a></td><td>Wrong value category used in <tt>scoped_allocator_adaptor::construct()</tt></td><td>Jacksonville</td><td></td></tr>