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

Revert r258222 because it's missing files. Will re-commit complete patch 

llvm-svn: 258228
This commit is contained in:
Eric Fiselier 2016-01-19 23:40:49 +00:00
parent 648f4e32ba
commit 88c15c9d6f
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libcxxabi/src/private_typeinfo.cpp
View File

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