Merge pull request #13221 from mitaclaw/nrvo-fails-1

GCC: Remedy NRVO Fails

1 files changed, 2 insertions, 3 deletions

diff --git a/Source/Core/VideoCommon/VertexLoaderX64.cpp b/Source/Core/VideoCommon/VertexLoaderX64.cpp
index aa8ad2bd67..c7cbf55257 100644
--- a/Source/Core/VideoCommon/VertexLoaderX64.cpp
+++ b/Source/Core/VideoCommon/VertexLoaderX64.cpp
@@ -57,11 +57,10 @@ VertexLoaderX64::VertexLoaderX64(const TVtxDesc& vtx_desc, const VAT& vtx_att)
 
 OpArg VertexLoaderX64::GetVertexAddr(CPArray array, VertexComponentFormat attribute)
 {
-  OpArg data = MDisp(src_reg, m_src_ofs);
   if (IsIndexed(attribute))
   {
     int bits = attribute == VertexComponentFormat::Index8 ? 8 : 16;
-    LoadAndSwap(bits, scratch1, data);
+    LoadAndSwap(bits, scratch1, MDisp(src_reg, m_src_ofs));
     m_src_ofs += bits / 8;
     if (array == CPArray::Position)
     {
@@ -74,7 +73,7 @@ OpArg VertexLoaderX64::GetVertexAddr(CPArray array, VertexComponentFormat attrib
   }
   else
   {
-    return data;
+    return MDisp(src_reg, m_src_ofs);
   }
 }