replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Recommit r256322: Fix PR25898 - Check for incomplete pointers types in can_catch(...) 

This patch re-commits r256322 and r256323. They were reverted due to a OS X
test failure. The test failure has been fixed by libc++ commit r258217.

This patch also adds some additional tests.

llvm-svn: 258222
This commit is contained in:
Eric Fiselier 2016-01-19 23:37:51 +00:00
parent 4cf56917ea
commit ccd5d8d801
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libcxxabi/src/private_typeinfo.cpp
View File

@ -34,9 +34,12 @@
// //
// _LIBCXX_DYNAMIC_FALLBACK is currently off by default. // _LIBCXX_DYNAMIC_FALLBACK is currently off by default.
#include <string.h>
#ifdef _LIBCXX_DYNAMIC_FALLBACK #ifdef _LIBCXX_DYNAMIC_FALLBACK
#include "abort_message.h" #include "abort_message.h"
#include <string.h>
#include <sys/syslog.h> #include <sys/syslog.h>
#endif #endif
@ -57,31 +60,19 @@ namespace __cxxabiv1
#pragma GCC visibility push(hidden) #pragma GCC visibility push(hidden)
#ifdef _LIBCXX_DYNAMIC_FALLBACK
inline inline
bool bool
is_equal(const std::type_info* x, const std::type_info* y, bool use_strcmp) is_equal(const std::type_info* x, const std::type_info* y, bool use_strcmp)
{ {
#ifndef _WIN32
if (!use_strcmp) if (!use_strcmp)
return x == y; return x == y;
return strcmp(x->name(), y->name()) == 0; return strcmp(x->name(), y->name()) == 0;
}
#else // !_LIBCXX_DYNAMIC_FALLBACK
inline
bool
is_equal(const std::type_info* x, const std::type_info* y, bool)
{
#ifndef _WIN32
return x == y;
#else #else
return (x == y) || (strcmp(x->name(), y->name()) == 0); return (x == y) || (strcmp(x->name(), y->name()) == 0);
#endif #endif
} }
#endif // _LIBCXX_DYNAMIC_FALLBACK
// __shim_type_info // __shim_type_info
@ -351,8 +342,17 @@ bool
__pbase_type_info::can_catch(const __shim_type_info* thrown_type, __pbase_type_info::can_catch(const __shim_type_info* thrown_type,
void*&) const void*&) const
{ {
return is_equal(this, thrown_type, false) || if (is_equal(thrown_type, &typeid(std::nullptr_t), false)) return true;
is_equal(thrown_type, &typeid(std::nullptr_t), false); bool use_strcmp = this->__flags & (__incomplete_class_mask |
__incomplete_mask);
if (!use_strcmp) {
const __pbase_type_info* thrown_pbase = dynamic_cast<const __pbase_type_info*>(
thrown_type);
if (!thrown_pbase) return false;
use_strcmp = thrown_pbase->__flags & (__incomplete_class_mask |
__incomplete_mask);
}
return is_equal(this, thrown_type, use_strcmp);
} }
#ifdef __clang__ #ifdef __clang__