diff --git a/llvm/lib/Target/AMDGPU/AMDGPULowerModuleLDSPass.cpp b/llvm/lib/Target/AMDGPU/AMDGPULowerModuleLDSPass.cpp
--- a/llvm/lib/Target/AMDGPU/AMDGPULowerModuleLDSPass.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPULowerModuleLDSPass.cpp
@@ -381,7 +381,7 @@
       }
     }
     assert(Map.size() == LDSVarsToTransform.size());
-    return {SGV, std::move(Map)};
+    return std::make_tuple(SGV, std::move(Map));
   }
 
   template <typename PredicateTy>