summaryrefslogtreecommitdiff
path: root/lib/ubsan
diff options
context:
space:
mode:
authorPeter Collingbourne <peter@pcc.me.uk>2015-09-12 00:08:28 +0000
committerPeter Collingbourne <peter@pcc.me.uk>2015-09-12 00:08:28 +0000
commit099c7501580e1712e4639dd1d19a2c43ca232ff1 (patch)
tree43d341d8d718946658e6cdd2098406fa9dba8dfc /lib/ubsan
parent69470be43161edab85b51b37b93dff25e44e4057 (diff)
ubsan: Disable vptr validation on powerpc64.
Should fix sanitizer-ppc64-linux1 bot. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@247493 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/ubsan')
-rw-r--r--lib/ubsan/ubsan_type_hash_itanium.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ubsan/ubsan_type_hash_itanium.cc b/lib/ubsan/ubsan_type_hash_itanium.cc
index 170da2cdb..3687c533e 100644
--- a/lib/ubsan/ubsan_type_hash_itanium.cc
+++ b/lib/ubsan/ubsan_type_hash_itanium.cc
@@ -193,7 +193,7 @@ struct VtablePrefix {
std::type_info *TypeInfo;
};
-#if SANITIZER_LINUX
+#if SANITIZER_LINUX && !defined(__powerpc64__)
bool isValidVptr(void *Vtable) {
// Validate the memory permissions of the vtable pointer and the first
// function pointer in the vtable. They should be r-- or r-x and r-x
@@ -218,7 +218,7 @@ bool isValidVptr(void *Vtable) {
}
return false;
}
-#else // !SANITIZER_LINUX
+#else // !SANITIZER_LINUX || __powerpc64__
bool isValidVptr(void *Vtable) {
return true;
}