From b1561522076fa1121ce9388f629da66841f15dd0 Mon Sep 17 00:00:00 2001 From: Hanjoung Lee Date: Thu, 12 May 2016 14:09:31 +0900 Subject: [PATCH] Fix Assert Error "Unexpected size when returning struct by value" on arm-softfp For only arm-softfp there is an assert error when returning struct as value. Fixes #4924 Signed-off-by: Hanjoung Lee hanjoung.lee@samsung.com --- src/jit/lclvars.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jit/lclvars.cpp b/src/jit/lclvars.cpp index 768e747..55a7b83 100644 --- a/src/jit/lclvars.cpp +++ b/src/jit/lclvars.cpp @@ -134,7 +134,7 @@ void Compiler::lvaInitTypeRef() if (!hasRetBuffArg && varTypeIsStruct(info.compRetNativeType)) { #if FEATURE_MULTIREG_RET && defined(FEATURE_HFA) - if (!info.compIsVarArgs && !opts.compUseSoftFP && IsHfa(info.compMethodInfo->args.retTypeClass)) + if (!info.compIsVarArgs && IsHfa(info.compMethodInfo->args.retTypeClass)) { info.compRetNativeType = TYP_STRUCT; } -- 2.7.4