From 7ac879c44864a7198cad46ca9c192cf4c703ba8a Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Wed, 26 Aug 2020 05:21:20 -0700 Subject: [PATCH] Android armv7 lowering change --- IDEHelper/Compiler/BfResolvedTypeUtils.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/IDEHelper/Compiler/BfResolvedTypeUtils.cpp b/IDEHelper/Compiler/BfResolvedTypeUtils.cpp index dcf9a4fd..f837b10a 100644 --- a/IDEHelper/Compiler/BfResolvedTypeUtils.cpp +++ b/IDEHelper/Compiler/BfResolvedTypeUtils.cpp @@ -1717,9 +1717,12 @@ bool BfTypeInstance::GetLoweredType(BfTypeUsage typeUsage, BfTypeCode* outTypeCo } else { - // Always do sret on non-Windows 32-bit - if ((typeUsage == BfTypeUsage_Return_NonStatic) || (typeUsage == BfTypeUsage_Return_Static)) - return false; + // We know this is correct for Linux x86 and Android armv7 + if (mModule->mCompiler->mOptions.mPlatformType == BfPlatformType_Linux) + { + if ((typeUsage == BfTypeUsage_Return_NonStatic) || (typeUsage == BfTypeUsage_Return_Static)) + return false; + } } }