Retry mmap() without MAP_JIT on older macOS

The MAP_JIT flag is only supported on macOS 10.14 and higher, so mmap() may fail on older ones. Bug: chromium:985816 Change-Id: If0e12d61b7f243d804e0213a43160e7b3db106d3 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/34511Tested-by: Nicolas Capens <nicolascapens@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com>

Retry mmap() without MAP_JIT on older macOS
c39e7c7c · Nicolas Capens · Nicolas Capens · 0a94b958 · c39e7c7c
Commit c39e7c7c authored Jul 30, 2019 by Nicolas Capens Committed by Nicolas Capens Jul 30, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

ExecutableMemory.cpp src/Reactor/ExecutableMemory.cpp +7 -0

No files found.
--- a/src/Reactor/ExecutableMemory.cpp
+++ b/src/Reactor/ExecutableMemory.cpp
@@ -247,6 +247,13 @@ void *allocateExecutable(size_t bytes)

 		if(mapping == MAP_FAILED)
 		{
+			// Retry without MAP_JIT (for older macOS versions).
+			mapping = mmap(nullptr, length, PROT_READ | PROT_WRITE,
+			               MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+		}
+
+		if(mapping == MAP_FAILED)
+		{
 			mapping = nullptr;
 		}
 	#else