summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Forstall <brucefo@microsoft.com>2017-06-12 13:33:13 -0700
committerGitHub <noreply@github.com>2017-06-12 13:33:13 -0700
commitc655981474be1d3aa0165408e5c3914c5cfc35a1 (patch)
treec1d033e2869e30f38038d1ec5cf994dab1810bd6
parent8f8c5e8f3596c7e1607356894473db75b4353503 (diff)
parentd71f8c15206d09f5e12aa8118867df10d03905e4 (diff)
downloadcoreclr-c655981474be1d3aa0165408e5c3914c5cfc35a1.tar.gz
coreclr-c655981474be1d3aa0165408e5c3914c5cfc35a1.tar.bz2
coreclr-c655981474be1d3aa0165408e5c3914c5cfc35a1.zip
Merge pull request #12163 from hseok-oh/ryujit/fix_11850_2
[RyuJIT/ARM32] Fix comment and ifdef condition
-rw-r--r--src/jit/morph.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/jit/morph.cpp b/src/jit/morph.cpp
index c6daba0860..9bd614ea9f 100644
--- a/src/jit/morph.cpp
+++ b/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))