[llvm-branch-commits] [compiler-rt-branch] r270400 - Merging r261982:

[Mohit K. Bhakkad via llvm-branch-commits]

Author: mohit.bhakkad
Date: Mon May 23 02:04:33 2016
New Revision: 270400

URL: http://llvm.org/viewvc/llvm-project?rev=270400&view=rev
Log:
Merging r261982:
------------------------------------------------------------------------
r261982 | mohit.bhakkad | 2016-02-26 12:14:10 +0530 (Fri, 26 Feb 2016) | 8 lines

[MSan] Endianness should not matter while printing a byte

Reviewers: eugenis

Subscribers: jaydeep, sagar, llvm-commits

Differential Revision: http://reviews.llvm.org/D17264
Differential Revision: http://reviews.llvm.org/D17563
------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_38/   (props changed)
    compiler-rt/branches/release_38/lib/msan/msan.cc
    compiler-rt/branches/release_38/lib/msan/msan_report.cc
    compiler-rt/branches/release_38/test/msan/msan_print_shadow3.cc

Propchange: compiler-rt/branches/release_38/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 02:04:33 2016
@@ -1 +1 @@
-/compiler-rt/trunk:258916,259755,260669,260839,260946,261073,261142,261148,261193,261263,261513,261721,261723,261837
+/compiler-rt/trunk:258916,259755,260669,260839,260946,261073,261142,261148,261193,261263,261513,261721,261723,261837,261982

Modified: compiler-rt/branches/release_38/lib/msan/msan.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_38/lib/msan/msan.cc?rev=270400&r1=270399&r2=270400&view=diff
==============================================================================
--- compiler-rt/branches/release_38/lib/msan/msan.cc (original)
+++ compiler-rt/branches/release_38/lib/msan/msan.cc Mon May 23 02:04:33 2016
@@ -462,13 +462,8 @@ void __msan_dump_shadow(const void *x, u
   }
 
   unsigned char *s = (unsigned char*)MEM_TO_SHADOW(x);
-  for (uptr i = 0; i < size; i++) {
-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-    Printf("%x%x ", s[i] & 0xf, s[i] >> 4);
-#else
+  for (uptr i = 0; i < size; i++)
     Printf("%x%x ", s[i] >> 4, s[i] & 0xf);
-#endif
-  }
   Printf("\n");
 }
 

Modified: compiler-rt/branches/release_38/lib/msan/msan_report.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_38/lib/msan/msan_report.cc?rev=270400&r1=270399&r2=270400&view=diff
==============================================================================
--- compiler-rt/branches/release_38/lib/msan/msan_report.cc (original)
+++ compiler-rt/branches/release_38/lib/msan/msan_report.cc Mon May 23 02:04:33 2016
@@ -221,11 +221,7 @@ void DescribeMemoryRange(const void *x,
     } else {
       unsigned char v = *(unsigned char *)s;
       if (v) last_quad_poisoned = true;
-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-      Printf("%x%x", v & 0xf, v >> 4);
-#else
       Printf("%x%x", v >> 4, v & 0xf);
-#endif
     }
     // Group end.
     if (pos % 4 == 3 && with_origins) {

Modified: compiler-rt/branches/release_38/test/msan/msan_print_shadow3.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_38/test/msan/msan_print_shadow3.cc?rev=270400&r1=270399&r2=270400&view=diff
==============================================================================
--- compiler-rt/branches/release_38/test/msan/msan_print_shadow3.cc (original)
+++ compiler-rt/branches/release_38/test/msan/msan_print_shadow3.cc Mon May 23 02:04:33 2016
@@ -6,7 +6,7 @@
 
 int main(void) {
   unsigned long long x = 0; // For 8-byte alignment.
-  uint32_t x_s = 0x12345678U;
+  char x_s[4] = {0x87, 0x65, 0x43, 0x21};
   __msan_partial_poison(&x, &x_s, sizeof(x_s));
   __msan_print_shadow(&x, sizeof(x_s));
   return 0;