maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert https://reviews.llvm.org/D56485. 

llvm-svn: 352033
This commit is contained in:
Martin Liska 2019-01-24 08:46:06 +00:00
parent dc5c81330b
commit acc348aad0
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler-rt/lib/sanitizer_common/sanitizer_platform.h
View File

@ -285,6 +285,12 @@
# define MSC_PREREQ(version) 0 # define MSC_PREREQ(version) 0
#endif #endif
#if defined(__arm64__) && SANITIZER_IOS
# define SANITIZER_NON_UNIQUE_TYPEINFO 1
#else
# define SANITIZER_NON_UNIQUE_TYPEINFO 0
#endif
// On linux, some architectures had an ABI transition from 64-bit long double // On linux, some architectures had an ABI transition from 64-bit long double
// (ie. same as double) to 128-bit long double. On those, glibc symbols // (ie. same as double) to 128-bit long double. On those, glibc symbols
// involving long doubles come in two versions, and we need to pass the // involving long doubles come in two versions, and we need to pass the

2
compiler-rt/lib/ubsan/ubsan_type_hash_itanium.cc
View File

@ -117,7 +117,7 @@ static bool isDerivedFromAtOffset(const abi::__class_type_info *Derived,
const abi::__class_type_info *Base, const abi::__class_type_info *Base,
sptr Offset) { sptr Offset) {
if (Derived->__type_name == Base->__type_name || if (Derived->__type_name == Base->__type_name ||
(Derived->__type_name[0] != '*' && (SANITIZER_NON_UNIQUE_TYPEINFO &&
!internal_strcmp(Derived->__type_name, Base->__type_name))) !internal_strcmp(Derived->__type_name, Base->__type_name)))
return Offset == 0; return Offset == 0;