[PATCH] D51364: [msan] Tentative fix for failing aarch64 test

[Kostya Kortchinsky via Phabricator via llvm-commits]

cryptoad created this revision.
cryptoad added reviewers: eugenis, vitalybuka, yroux.
Herald added a reviewer: javed.absar.
Herald added subscribers: Sanitizers, delcypher, kristof.beyls.

Follow up to a discussion in post https://reviews.llvm.org/D50940 commit.

http://lab.llvm.org:8011/builders/clang-cmake-aarch64-full/builds/5703/steps/ninja%20check%202/logs/FAIL%3A%20MemorySanitizer-AARCH64%3A%3A%20mmap.cc

0xf00000000 appears to be a valid mapping on aarch64 now. Add it to the list of
app address mappings in the mmap.cc test. Reformat the list a bit as well so
that all the addresses are easier to read.

I can't test this, for all I know lower mappings might also work now and that
might require a couple of iterations. If someone can verify that this solves the
issue at hand, please go ahead!


Repository:
  rCRT Compiler Runtime

https://reviews.llvm.org/D51364

Files:
  test/msan/mmap.cc


Index: test/msan/mmap.cc
===================================================================
--- test/msan/mmap.cc
+++ test/msan/mmap.cc
@@ -30,21 +30,22 @@
     uintptr_t start;
     uintptr_t end;
   } mappings[] = {
-    {0x05000000000ULL, 0x06000000000ULL},
-    {0x07000000000ULL, 0x08000000000ULL},
-    {0x0F000000000ULL, 0x10000000000ULL},
-    {0x11000000000ULL, 0x12000000000ULL},
-    {0x20000000000ULL, 0x21000000000ULL},
-    {0x2A000000000ULL, 0x2B000000000ULL},
-    {0x2E000000000ULL, 0x2F000000000ULL},
-    {0x3B000000000ULL, 0x3C000000000ULL},
-    {0x3F000000000ULL, 0x40000000000ULL},
-    {0x0041000000000ULL, 0x0042000000000ULL},
-    {0x0050000000000ULL, 0x0051000000000ULL},
-    {0x0058000000000ULL, 0x0059000000000ULL},
-    {0x0061000000000ULL, 0x0062000000000ULL},
-    {0x0AAAAA0000000ULL, 0x0AAAB00000000ULL},
-    {0x0FFFF00000000ULL, 0x1000000000000ULL},
+    {0x000F00000000ULL, 0x001000000000ULL},
+    {0x005000000000ULL, 0x006000000000ULL},
+    {0x007000000000ULL, 0x008000000000ULL},
+    {0x00F000000000ULL, 0x010000000000ULL},
+    {0x011000000000ULL, 0x012000000000ULL},
+    {0x020000000000ULL, 0x021000000000ULL},
+    {0x02A000000000ULL, 0x02B000000000ULL},
+    {0x02E000000000ULL, 0x02F000000000ULL},
+    {0x03B000000000ULL, 0x03C000000000ULL},
+    {0x03F000000000ULL, 0x040000000000ULL},
+    {0x041000000000ULL, 0x042000000000ULL},
+    {0x050000000000ULL, 0x051000000000ULL},
+    {0x058000000000ULL, 0x059000000000ULL},
+    {0x061000000000ULL, 0x062000000000ULL},
+    {0xAAAAA0000000ULL, 0xAAAB00000000ULL},
+    {0xFFFF00000000ULL, 0x1000000000000ULL},
   };
   const size_t mappingsSize = sizeof (mappings) / sizeof (mappings[0]);
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D51364.162888.patch
Type: text/x-patch
Size: 1690 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180828/beafe03d/attachment.bin>