From a4b252d3258ba8c860516a0be2dc45923621bf5a Mon Sep 17 00:00:00 2001 From: Hyeongseok Oh Date: Thu, 8 Jun 2017 16:15:13 +0900 Subject: [PATCH] [RyuJIT/ARM32] Fix comment and ifdef condition Fix comment for elif and endif Apply fix for RyuJIT/ARM32 only (not for LegacyJIT/ARM32) Commit migrated from https://github.com/dotnet/coreclr/commit/d71f8c15206d09f5e12aa8118867df10d03905e4 --- src/coreclr/src/jit/morph.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/coreclr/src/jit/morph.cpp b/src/coreclr/src/jit/morph.cpp index 3ada58d..5aff4f5 100644 --- a/src/coreclr/src/jit/morph.cpp +++ b/src/coreclr/src/jit/morph.cpp @@ -2048,7 +2048,7 @@ GenTreePtr Compiler::fgMakeTmpArgNode( if (varTypeIsStruct(type)) { -#if defined(_TARGET_AMD64_) || defined(_TARGET_ARM64_) || defined(_TARGET_ARM_) +#if defined(_TARGET_AMD64_) || defined(_TARGET_ARM64_) || (!defined(LEGACY_BACKEND) && defined(_TARGET_ARM_)) #ifdef FEATURE_UNIX_AMD64_STRUCT_PASSING @@ -2112,7 +2112,7 @@ GenTreePtr Compiler::fgMakeTmpArgNode( #endif // FEATURE_MULTIREG_ARGS } -#else // not (_TARGET_AMD64_ or _TARGET_ARM64_) +#else // not (_TARGET_AMD64_ or _TARGET_ARM64_ or (!LEGACY_BACKEND and _TARGET_ARM_)) // other targets, we pass the struct by value assert(varTypeIsStruct(type)); @@ -2123,7 +2123,7 @@ GenTreePtr Compiler::fgMakeTmpArgNode( // gtNewObjNode will set the GTF_EXCEPT flag if this is not a local stack object. arg = gtNewObjNode(lvaGetStruct(tmpVarNum), addrNode); -#endif // not (_TARGET_AMD64_ or _TARGET_ARM64_) +#endif // not (_TARGET_AMD64_ or _TARGET_ARM64_ or (!LEGACY_BACKEND and _TARGET_ARM_)) } // (varTypeIsStruct(type)) -- 2.7.4