From 20cb19618d84df3c428bc2f498685f813a85bc0e Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Tue, 17 Sep 2019 23:26:59 +0300 Subject: [PATCH] Fix vm::reserve_map NRVO --- rpcs3/Emu/Memory/vm.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/rpcs3/Emu/Memory/vm.cpp b/rpcs3/Emu/Memory/vm.cpp index 314a2d580c..20063abf85 100644 --- a/rpcs3/Emu/Memory/vm.cpp +++ b/rpcs3/Emu/Memory/vm.cpp @@ -1079,7 +1079,12 @@ namespace vm // Fixed address allocation area = _get_map(location, addr); - return !area ? _map(addr, area_size, flags) : area; + if (area) + { + return area; + } + + return _map(addr, area_size, flags); } inline namespace ps3_