Expose eastl_enabled boolean, workaround for buggy fixed_hash_map::re…

…serve()
fwsGonzo · Oct 8, 2023 · 9d26fa5 · 9d26fa5
1 parent 18dfb8e
commit 9d26fa5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/libriscv/common.hpp b/lib/libriscv/common.hpp
@@ -71,6 +71,11 @@ namespace riscv
 #else
 	static constexpr bool memory_arena_is_default = false;
 #endif
+#ifdef EASTL_ENABLED
+	static constexpr bool eastl_enabled = true;
+#else
+	static constexpr bool eastl_enabled = false;
+#endif
 }
 
 namespace riscv

diff --git a/lib/libriscv/memory.cpp b/lib/libriscv/memory.cpp
@@ -423,7 +423,10 @@ namespace riscv
 		{
 			// Hardly any pages are dont_fork, so we estimate that
 			// all master pages will be loaned.
-			m_pages.reserve(master.memory.pages().size());
+			if constexpr (!eastl_enabled) {
+				// Workaround for buggy EASTL behavior.
+				m_pages.reserve(master.memory.pages().size());
+			}
 			for (const auto& it : master.memory.pages())
 			{
 				const auto& page = it.second;