From c40359d6c833e564cd633171765565979654ff28 Mon Sep 17 00:00:00 2001 From: Mikhail Skvortcov Date: Thu, 27 Apr 2017 13:54:35 +0300 Subject: [PATCH] RyuJIT/ARM32: Update GT_PUTARG_REG codegen. Commit migrated from https://github.com/dotnet/coreclr/commit/5b7163c660a81ee39a286c2b28f054678c7109c9 --- src/coreclr/src/jit/codegenarm.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/coreclr/src/jit/codegenarm.cpp b/src/coreclr/src/jit/codegenarm.cpp index c28b27b..5650803 100644 --- a/src/coreclr/src/jit/codegenarm.cpp +++ b/src/coreclr/src/jit/codegenarm.cpp @@ -900,18 +900,18 @@ void CodeGen::genCodeForTreeNode(GenTreePtr treeNode) break; case GT_PUTARG_REG: - { - NYI_IF(targetType == TYP_STRUCT, "GT_PUTARG_REG: struct support not implemented"); - - // commas show up here commonly, as part of a nullchk operation - GenTree* op1 = treeNode->gtOp.gtOp1->gtEffectiveVal(); - // If child node is not already in the register we need, move it - genConsumeReg(op1); - if (treeNode->gtRegNum != op1->gtRegNum) + assert(targetType != TYP_STRUCT); // Any TYP_STRUCT register args should have been removed by + // fgMorphMultiregStructArg + // We have a normal non-Struct targetType { - inst_RV_RV(ins_Move_Extend(targetType, true), treeNode->gtRegNum, op1->gtRegNum, targetType); + GenTree* op1 = treeNode->gtOp.gtOp1; + // If child node is not already in the register we need, move it + genConsumeReg(op1); + if (targetReg != op1->gtRegNum) + { + inst_RV_RV(ins_Copy(targetType), targetReg, op1->gtRegNum, targetType); + } } - } genProduceReg(treeNode); break; -- 2.7.4