From 25ac0b1c40702c8e8112de2bb41c46fd29eb2711 Mon Sep 17 00:00:00 2001 From: Daniel Sanders Date: Fri, 14 Aug 2015 22:34:26 +0000 Subject: [PATCH] Merging r244646: ------------------------------------------------------------------------ r244646 | dsanders | 2015-08-11 19:40:02 +0100 (Tue, 11 Aug 2015) | 5 lines [ubsan][mips] Revise r243384 to avoid special casing big-endian mips. Account for the case when uptr is 32-bit instead of trying to fix this case using the little endian path. ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/branches/release_37@245111 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/ubsan/ubsan_value.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/ubsan/ubsan_value.cc b/lib/ubsan/ubsan_value.cc index 8e298d40a9..79dc4c8e82 100644 --- a/lib/ubsan/ubsan_value.cc +++ b/lib/ubsan/ubsan_value.cc @@ -83,11 +83,11 @@ FloatMax Value::getFloatValue() const { #endif case 32: { float Value; -#if defined(__BIG_ENDIAN__) && !defined(__mips__) - // For big endian the float value is in the highest addressed 4 bytes - // (the least significant bits) but we must also consider that we might - // have a 32-bit type. - internal_memcpy(&Value, ((const char*)&Val + 1) - 4, 4); +#if defined(__BIG_ENDIAN__) + // For big endian the float value is in the last 4 bytes. + // On some targets we may only have 4 bytes so we count backwards from + // the end of Val to account for both the 32-bit and 64-bit cases. + internal_memcpy(&Value, ((const char*)(&Val + 1)) - 4, 4); #else internal_memcpy(&Value, &Val, 4); #endif