From: Jarret Shook Date: Wed, 25 May 2016 22:46:46 +0000 (-0700) Subject: arm32 build fix. X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ae88d1daea78dd696391ac16c381963229f48ac4;p=platform%2Fupstream%2Fcoreclr.git arm32 build fix. Add an #else statement so that an unreachable return statement is not inserted. --- diff --git a/src/jit/compiler.h b/src/jit/compiler.h index e44b0ecae4..cf3a6b4c50 100644 --- a/src/jit/compiler.h +++ b/src/jit/compiler.h @@ -7906,14 +7906,14 @@ public : // TODO-ARM64: Does this apply for ARM64 too? bool compMethodReturnsMultiRegRetType() { -#if FEATURE_MULTIREG_RET -#if defined(FEATURE_UNIX_AMD64_STRUCT_PASSING) || defined(_TARGET_ARM_) +#if FEATURE_MULTIREG_RET && (defined(FEATURE_UNIX_AMD64_STRUCT_PASSING) || defined(_TARGET_ARM_)) // Methods returning a struct in two registers is considered having a return value of TYP_STRUCT. // Such method's compRetNativeType is TYP_STRUCT without a hidden RetBufArg return varTypeIsStruct(info.compRetNativeType) && (info.compRetBuffArg == BAD_VAR_NUM); -#endif -#endif +#else return false; +#endif // FEATURE_MULTIREG_RET && (defined(FEATURE_UNIX_AMD64_STRUCT_PASSING) || defined(_TARGET_ARM_)) + } #if FEATURE_MULTIREG_ARGS