commit 6f486bb0c5099050f8bdd1d148fb442e1a8d2e71
author swift-ci <swift-ci@users.noreply.github.com> Wed Jun 14 14:02:35 2017 -0700
committer swift-ci <swift-ci@users.noreply.github.com> Wed Jun 14 14:02:35 2017 -0700
tree 778f479a506664a9ebc47ec0ea4b81a1bffefc91
parent 63f173232b393040711aae87d57a11b2646beca1
parent 0ef8f667f29c49723f56c41192c86ad4218a2b80

Merge remote-tracking branch 'origin/swift-4.0-branch' into stable

lib/ubsan/ubsan_type_hash_itanium.cc

diff --git a/lib/ubsan/ubsan_type_hash_itanium.cc b/lib/ubsan/ubsan_type_hash_itanium.cc
index 729c4a0..dcce0dd 100644
--- a/lib/ubsan/ubsan_type_hash_itanium.cc
+++ b/lib/ubsan/ubsan_type_hash_itanium.cc
@@ -197,9 +197,9 @@
 };
 VtablePrefix *getVtablePrefix(void *Vtable) {
   VtablePrefix *Vptr = reinterpret_cast<VtablePrefix*>(Vtable);
-  if (!IsAccessibleMemoryRange((uptr)Vptr, sizeof(VtablePrefix)))
-    return nullptr;
   VtablePrefix *Prefix = Vptr - 1;
+  if (!IsAccessibleMemoryRange((uptr)Prefix, sizeof(VtablePrefix)))
+    return nullptr;
   if (!Prefix->TypeInfo)
     // This can't possibly be a valid vtable.
     return nullptr;