Merge pull request #39 from Shopify/flavorjones-support-valgrind

ujit_asm: if mmap() fails with the address hint, try without
github · Feb 11, 2021 · b024ae0 · b024ae0
2 parents 1ae750f + ef30c26
commit b024ae0
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/ujit_asm.c b/ujit_asm.c
@@ -137,9 +137,19 @@ uint8_t* alloc_exec_mem(uint32_t mem_size)
         0
     );
 
+    if (mem_block == MAP_FAILED) {
+        mem_block = (uint8_t*)mmap(
+            NULL, // try again without the address hint (e.g., valgrind)
+            mem_size,
+            PROT_READ | PROT_WRITE | PROT_EXEC,
+            MAP_PRIVATE | MAP_ANONYMOUS,
+            -1,
+            0
+            );
+    }
+
     // Check that the memory mapping was successful
-    if (mem_block == MAP_FAILED)
-    {
+    if (mem_block == MAP_FAILED) {
         fprintf(stderr, "mmap call failed\n");
         exit(-1);
     }