3 files changed, 64 insertions, 1 deletions
diff --git a/libcxxabi/src/private_typeinfo.cpp b/libcxxabi/src/private_typeinfo.cpp
index 6cc2f64ea67..cb7b7dc1e91 100644
--- a/libcxxabi/src/private_typeinfo.cpp
+++ b/libcxxabi/src/private_typeinfo.cpp
@@ -238,7 +238,10 @@ bool
 __array_type_info::can_catch(const __shim_type_info* thrown_type,
                              void*&) const
 {
-    // TODO:  Can this be called?
+    // We can get here if someone tries to catch an array by reference.
+    //   However if someone tries to throw an array, it immediately gets
+    //   converted to a pointer, which will not convert back to an array
+    //   at the catch clause.  So this can never catch anything.
     return false;
 }
 
diff --git a/libcxxabi/test/catch_array_01.cpp b/libcxxabi/test/catch_array_01.cpp
new file mode 100644
index 00000000000..4997602a6d0
--- /dev/null
+++ b/libcxxabi/test/catch_array_01.cpp
@@ -0,0 +1,30 @@
+//===---------------------- catch_array_01.cpp ----------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// Can you have a catch clause of array type that catches anything?
+
+#include <cassert>
+
+int main()
+{
+    typedef char Array[4];
+    Array a = {'H', 'i', '!', 0};
+    try
+    {
+        throw a;  // converts to char*
+        assert(false);
+    }
+    catch (Array& b)  // can't catch char*
+    {
+        assert(false);
+    }
+    catch (...)
+    {
+    }
+}
diff --git a/libcxxabi/test/catch_array_02.cpp b/libcxxabi/test/catch_array_02.cpp
new file mode 100644
index 00000000000..a06e6aaa056
--- /dev/null
+++ b/libcxxabi/test/catch_array_02.cpp
@@ -0,0 +1,30 @@
+//===---------------------- catch_array_02.cpp ----------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// Can you have a catch clause of array type that catches anything?
+
+#include <cassert>
+
+int main()
+{
+    typedef char Array[4];
+    Array a = {'H', 'i', '!', 0};
+    try
+    {
+        throw a;  // converts to char*
+        assert(false);
+    }
+    catch (Array b)  // equivalent to char*
+    {
+    }
+    catch (...)
+    {
+        assert(false);
+    }
+}