diff options
author | Howard Hinnant <hhinnant@apple.com> | 2012-02-01 19:21:28 +0000 |
---|---|---|
committer | Howard Hinnant <hhinnant@apple.com> | 2012-02-01 19:21:28 +0000 |
commit | aafd08aa288da66805f97231e8c64020bc9d50c6 (patch) | |
tree | f90cbaa7c320dce033691356c658334acf89250f | |
parent | 7c73587e51f0f8edcf01eb1d9529dcac24c9681f (diff) |
Quash TODO regarding catch by array type. Add tests to back it up.
git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@149527 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | src/private_typeinfo.cpp | 5 | ||||
-rw-r--r-- | test/catch_array_01.cpp | 30 | ||||
-rw-r--r-- | test/catch_array_02.cpp | 30 |
3 files changed, 64 insertions, 1 deletions
diff --git a/src/private_typeinfo.cpp b/src/private_typeinfo.cpp index 6cc2f64..cb7b7dc 100644 --- a/src/private_typeinfo.cpp +++ b/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/test/catch_array_01.cpp b/test/catch_array_01.cpp new file mode 100644 index 0000000..4997602 --- /dev/null +++ b/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/test/catch_array_02.cpp b/test/catch_array_02.cpp new file mode 100644 index 0000000..a06e6aa --- /dev/null +++ b/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); + } +} |